自助建站-流程管理：获取所有组件样式

app/JsonRpc/PublicRpcService.php

@@ -2611,16 +2611,25 @@ class PublicRpcService implements PublicRpcServiceInterface
         return Result::success($component_type);
     }
     /**
-     * 组件管理-获取所有组件
+     * 组件管理-获取所有组件样式
      */
     public function getAllComponent(array $data): array
     {
         $where = [];
         if((isset($data['sector_id']) && !empty($data['sector_id'])) || (isset($data['sort_id']) && !empty($data['sort_id']))){
-            $sector['sector_component.sector_id'] = $data['sector_id'];
+            $sector_id['sector.sector_id'] = $data['sector_id'];
             $sector['sector_component.sort_id'] = $data['sort_id'];
-            $where = SectorComponent::where($sector)->pluck('component_id')->toArray();
-            $component = Component::whereIn('component_type',$where)->get()->all();
+            $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)
+            ->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')
+            ->get()->all();
         }else{
             if(isset($data['type_id']) && !empty($data['type_id'])){
                 $where['component.type_id'] = $data['type_id'];