修改添加底部导航名称若同一网站去重条件

app/JsonRpc/FooterService.php

@@ -61,12 +61,19 @@ class FooterService implements FooterServiceInterface
         if(empty($data)){
             $result = Website::select('website_name','id')->get();
         }else{
-            $name = FooterCategory::where('name',$data['name'])->first();
-            if(!empty($name)){
-                return Result::error("该底部导航名称已存在！");
+            // 底部导航类型  0：内容型；1：列表型；
+            if(in_array($data['type'], [0, 1])){
+                // 同一网站下的底部导航名称不能重复
+                $name = FooterCategory::where('website_id',$data['website_id'])->where('name',$data['name'])->first();
+                if(!empty($name)){
+                    return Result::error("该底部导航名称已存在！");
+                }else{
+                    $result = FooterCategory::insertGetId($data);
+                }
             }else{
-                $result = FooterCategory::insertGetId($data);
+                return Result::error("请输入正确的底部导航类型！");
             }
+           
         }
         if(empty($result)){
             return Result::error("添加失败！");
@@ -96,7 +103,7 @@ class FooterService implements FooterServiceInterface
                 'web'=>$web
             ];
         }else{
-            $all_categories = FooterCategory::all()->pluck('name')->toArray();
+            $all_categories = FooterCategory::where('website_id',$data['website_id'])->pluck('name')->toArray();
             // 检查修改后的数据是否与已有数据重复
             if (in_array($data['name'], $all_categories)) {
                 return Result::error("修改后的底部导航名称已存在！");

runtime/hyperf.pid

@@ -1 +1 @@
-41227
+9544

runtime/logs/hyperf.log

@@ -1460,3 +1460,86 @@
 [2024-12-30T15:45:17.878604+08:00] sql.INFO: [14.7] select * from `footer_content` where (`fcat_id` = '12') order by `updated_at` desc limit 3 offset 3 [] []
 [2024-12-30T15:45:17.893320+08:00] sql.INFO: [13.47] select count(*) as aggregate from `footer_content` where (`fcat_id` = '12') [] []
 [2024-12-30T15:45:35.938224+08:00] sql.INFO: [16.73] select `footer_content`.*, `footer_category`.`type` from `footer_content` left join `footer_category` on `footer_category`.`id` = `fcat_id` where `footer_content`.`id` = '14' limit 1 [] []
+[2025-01-16T13:27:42.928149+08:00] sql.INFO: [278.48] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:27:43.177607+08:00] sql.INFO: [229.24] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T13:27:57.345884+08:00] sql.INFO: [14.85] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`website`.`website_name` like '%三农%') order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:28:11.820356+08:00] sql.INFO: [443.24] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`footer_category`.`name` like '%111%') order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:28:22.925669+08:00] sql.INFO: [15.61] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:28:22.942416+08:00] sql.INFO: [13.76] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T13:29:57.024814+08:00] sql.INFO: [58.18] select * from `footer_category` where `name` = '这你就不懂了吧曹' limit 1 [] []
+[2025-01-16T13:30:09.982022+08:00] sql.INFO: [15.18] select * from `footer_category` where `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T13:30:13.895929+08:00] sql.INFO: [14.54] select * from `footer_category` where `name` = '这你就不懂了吧1' limit 1 [] []
+[2025-01-16T13:30:13.911503+08:00] sql.INFO: [15.04] insert into `footer_category` (`website_id`, `name`, `type`) values ('2', '这你就不懂了吧1', '1') [] []
+[2025-01-16T13:30:33.161896+08:00] sql.INFO: [16.4] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:30:33.179189+08:00] sql.INFO: [14.68] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T13:32:34.684459+08:00] sql.INFO: [66.26] select * from `footer_category` where `id` = '5' limit 1 [] []
+[2025-01-16T13:32:44.380666+08:00] sql.INFO: [15.76] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:32:44.405063+08:00] sql.INFO: [15.4] select `website_name`, `id` from `website` [] []
+[2025-01-16T13:32:44.428033+08:00] sql.INFO: [18.28] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where `footer_category`.`id` = '16' limit 1 [] []
+[2025-01-16T13:33:30.628738+08:00] sql.INFO: [17.46] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:33:30.644392+08:00] sql.INFO: [14.65] select `website_name`, `id` from `website` [] []
+[2025-01-16T13:33:30.665125+08:00] sql.INFO: [15.84] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where `footer_category`.`id` = '16' limit 1 [] []
+[2025-01-16T13:33:32.357249+08:00] sql.INFO: [14.77] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:33:32.372619+08:00] sql.INFO: [14.55] select `website_name`, `id` from `website` [] []
+[2025-01-16T13:33:32.394407+08:00] sql.INFO: [17.52] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where `footer_category`.`id` = '16' limit 1 [] []
+[2025-01-16T13:34:03.697770+08:00] sql.INFO: [17.29] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:34:03.713376+08:00] sql.INFO: [14.52] select * from `footer_category` [] []
+[2025-01-16T13:34:27.134320+08:00] sql.INFO: [17.16] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:34:27.151218+08:00] sql.INFO: [16.01] select `website_name`, `id` from `website` [] []
+[2025-01-16T13:34:27.172554+08:00] sql.INFO: [17.21] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where `footer_category`.`id` = '16' limit 1 [] []
+[2025-01-16T13:36:17.452588+08:00] sql.INFO: [62.9] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:36:17.469849+08:00] sql.INFO: [16.51] select `website_name`, `id` from `website` [] []
+[2025-01-16T13:36:17.493712+08:00] sql.INFO: [17.79] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where `footer_category`.`id` = '16' limit 1 [] []
+[2025-01-16T13:36:31.409199+08:00] sql.INFO: [16.16] select * from `footer_category` where `id` = '16' limit 1 [] []
+[2025-01-16T13:36:31.425267+08:00] sql.INFO: [15.22] select * from `footer_category` [] []
+[2025-01-16T13:37:04.238802+08:00] sql.INFO: [15.19] select * from `footer_category` where `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T13:37:10.019350+08:00] sql.INFO: [18.46] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T13:37:10.038081+08:00] sql.INFO: [15.4] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T14:19:36.925105+08:00] sql.INFO: [57.15] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:19:39.601842+08:00] sql.INFO: [16.74] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:19:40.590575+08:00] sql.INFO: [15.87] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:21:09.509377+08:00] sql.INFO: [268.56] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:21:46.656936+08:00] sql.INFO: [16.75] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:22:16.732379+08:00] sql.INFO: [16.14] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:22:47.825414+08:00] sql.INFO: [17.18] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:22:48.893855+08:00] sql.INFO: [17.25] select * from `footer_category` where `name` = '这你就不懂了吧' and `website_id` = '2' limit 1 [] []
+[2025-01-16T14:22:57.129369+08:00] sql.INFO: [65.9] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:00.740501+08:00] sql.INFO: [61.67] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:10.382086+08:00] sql.INFO: [16.34] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:14.575080+08:00] sql.INFO: [69.88] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:25.595470+08:00] sql.INFO: [16.74] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:26.520145+08:00] sql.INFO: [17.12] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:29.486665+08:00] sql.INFO: [61.49] select * from `footer_category` where `website_id` = '2' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:23:51.597866+08:00] sql.INFO: [13.7] select * from `footer_category` where `website_id` = '5' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:25:26.680206+08:00] sql.INFO: [62.59] select `website_name`, `id` from `website` [] []
+[2025-01-16T14:25:48.044515+08:00] sql.INFO: [1718.86] select * from `footer_category` where `website_id` = '5' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T14:25:48.062265+08:00] sql.INFO: [17.03] insert into `footer_category` (`website_id`, `name`, `type`) values ('5', '这你就不懂了吧', '1') [] []
+[2025-01-16T15:19:17.362588+08:00] sql.INFO: [66.98] select * from `footer_category` where `website_id` = '5' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T15:19:24.357499+08:00] sql.INFO: [62.81] select `website_name`, `id` from `website` [] []
+[2025-01-16T15:19:31.818117+08:00] sql.INFO: [18.18] select * from `footer_category` where `website_id` = '15' and `name` = '这你就不懂了吧' limit 1 [] []
+[2025-01-16T15:19:31.834160+08:00] sql.INFO: [15.41] insert into `footer_category` (`website_id`, `name`, `type`) values ('15', '这你就不懂了吧', '1') [] []
+[2025-01-16T15:19:35.906679+08:00] sql.INFO: [16.95] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:19:35.925288+08:00] sql.INFO: [15.59] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T15:19:45.209217+08:00] sql.INFO: [17.18] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`footer_category`.`name` like '%这你就不懂了吧%') order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:25:56.221324+08:00] sql.INFO: [60.12] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`website`.`website_name` like '%三农网-测试专用%') order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:26:07.811905+08:00] sql.INFO: [14.42] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:26:27.738384+08:00] sql.INFO: [16.2] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:26:28.992652+08:00] sql.INFO: [14.93] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:26:30.428221+08:00] sql.INFO: [225.27] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:26:32.444921+08:00] sql.INFO: [18.04] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:00.179446+08:00] sql.INFO: [269.75] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:06.429798+08:00] sql.INFO: [487.04] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:12.627003+08:00] sql.INFO: [227.06] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:14.170183+08:00] sql.INFO: [671.6] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:33.803464+08:00] sql.INFO: [308.03] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:36.409914+08:00] sql.INFO: [66.83] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:28:36.448947+08:00] sql.INFO: [16.59] select `name` from `footer_category` where `website_id` = '2' [] []
+[2025-01-16T15:29:35.887860+08:00] sql.INFO: [17.57] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`footer_category`.`name` like '%这你就不懂了吧%') order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:33:13.206340+08:00] sql.INFO: [64.62] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:33:13.229019+08:00] sql.INFO: [17.77] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T15:33:42.850785+08:00] sql.INFO: [17.13] select * from `footer_category` where `id` = '9' limit 1 [] []
+[2025-01-16T15:33:42.865932+08:00] sql.INFO: [14.04] select `name` from `footer_category` where `website_id` = '2' [] []
+[2025-01-16T15:33:42.892731+08:00] sql.INFO: [16.89] update `footer_category` set `name` = '三农1', `website_id` = '2', `id` = '9', `footer_category`.`updated_at` = '2025-01-16 15:33:42' where `id` = '9' [] []
+[2025-01-16T15:33:46.441081+08:00] sql.INFO: [17.09] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` order by `updated_at` desc limit 10 offset 0 [] []
+[2025-01-16T15:33:46.570028+08:00] sql.INFO: [125.67] select count(*) as aggregate from `footer_category` [] []
+[2025-01-16T15:33:59.629410+08:00] sql.INFO: [16.74] select `footer_category`.*, `website`.`website_name`, `website`.`id` as `website_id` from `footer_category` left join `website` on `website`.`id` = `footer_category`.`website_id` where (`footer_category`.`name` like '%三农%') order by `updated_at` desc limit 10 offset 0 [] []