Przeglądaj źródła

修改添加组件样式、修改组件样式的接口;

15313670163 5 miesięcy temu
rodzic
commit
4722e92ac1
1 zmienionych plików z 8 dodań i 3 usunięć
  1. 8 3
      app/JsonRpc/PublicRpcService.php

+ 8 - 3
app/JsonRpc/PublicRpcService.php

@@ -2640,14 +2640,14 @@ class PublicRpcService implements PublicRpcServiceInterface
             $sector['sector_component.sort_id'] = $data['sort_id'];
             $sectors = Sector::where($sector_id)
             ->leftJoin('sector_component','sector.sector_id','sector_component.sector_id')
-            ->select('sector.template_id','sector_component.component_id')
             ->where($sector)
+            ->select('sector.template_id','sector_component.component_id')
             ->get()->all();
             $component_id = array_column($sectors,'component_id');
             $template = ['template_id' => $sectors[0]['template_id']];
             $component = ComponentImg::whereIn('component_id',$component_id)
             ->where($template)
-            ->select('img_id','img_name','img_url')
+            ->select('img_id','img_name','img_url','template_id')
             ->get()->all();
         }else{
             if(isset($data['type_id']) && !empty($data['type_id'])){
@@ -2851,7 +2851,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                 return Result::error('该组件已存在此皮肤的预览图!');
             }
         }
-        $component = ComponentImg::where('component_id',$data['component_id'])->where('img_id',$data['img_id'])->first();
+        $component = ComponentImg::where('template_id',$data['template_id'])->where('component_id',$data['component_id'])->where('img_id',$data['img_id'])->first();
         if(!empty($component)){
             return Result::error('组件预览图编号已存在!');
         }
@@ -2887,6 +2887,11 @@ class PublicRpcService implements PublicRpcServiceInterface
                 return Result::error('该组件已存在此皮肤的预览图!');
             }
         }
+        $component = ComponentImg::where('id','!=',$data['id'])->where('component_id',$data['component_id'])->where('template_id',$data['template_id'])->where('img_id',$data['img_id'])->first();
+        if(!empty($component)){
+            return Result::error('组件预览图编号已存在!');
+        }
+        //  return Result::success($component);
         unset($data['user_id']);
         // unset($data['updated_at']);
         $id = $data['id'];