Merge branch '20250210_lj_zhanqun' into dev

app/JsonRpc/WebsiteService.php

@@ -1119,6 +1119,7 @@ class WebsiteService implements WebsiteServiceInterface
     {
         $website_id = $data['website_id'];
         $result = WebsiteCategory::where(['website_id' => $website_id])->delete();
+
         if ($result) {
             return Result::success($result);
         } else {
@@ -1511,15 +1512,15 @@ class WebsiteService implements WebsiteServiceInterface
     //20250212  网站标识
     public function addWebsiteGroup(array $data): array
     {
-        //添加信息
-        $result = WebsiteGroup::insertGetId($data);
-        var_dump($result);
+
         //判斷name是不是重复
         $websiteGroupInfo = WebsiteGroup::query()->where('name', $data['name'])->first();
         if (!empty($websiteGroupInfo)) {
             return Result::error("网站标识重复", 0);
         }
-
+        //添加信息
+        $result = WebsiteGroup::insertGetId($data);
+        var_dump($result);
         if (empty($result)) {
             return Result::error("创建失败", 0);
         } else {
@@ -1571,6 +1572,13 @@ class WebsiteService implements WebsiteServiceInterface
             'name' => $data['name'],
             'web_ids' => $data['web_ids'],
         ];
+
+        //判斷name是不是重复
+        $websiteGroupInfo = WebsiteGroup::query()->where('name', $data['name'])->first();
+        if (!empty($websiteGroupInfo)) {
+            return Result::error("网站标识重复", 0);
+        }
+
         $result = WebsiteGroup::where($where)->update($insertData);
         var_dump($result, '------更新');
         if (empty($result)) {
@@ -1602,7 +1610,7 @@ class WebsiteService implements WebsiteServiceInterface
         if (isset($data['website_id']) && !empty($data['website_id'])) {
             array_push($where, ['website_id', '=', $data['website_id']]);
         }
-        if (isset($data['pid']) && !empty($data['pid'])) {
+        if (isset($data['pid'])) {
             array_push($where, ['pid', '=', $data['pid']]);
         }
         $list = WebsiteCategory::query()->where($where)->get();