Browse Source

修改自助建站-流程管理接口: 获取所有通栏、获取所有组件的接口

15313670163 1 day ago
parent
commit
ab649f35ea
1 changed files with 3 additions and 6 deletions
  1. 3 6
      app/JsonRpc/PublicRpcService.php

+ 3 - 6
app/JsonRpc/PublicRpcService.php

@@ -2483,7 +2483,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             $sector['sector_component.sector_id'] = $data['sector_id'];
             $sector['sector_component.sector_id'] = $data['sector_id'];
             $sector['sector_component.sort_id'] = $data['sort_id'];
             $sector['sector_component.sort_id'] = $data['sort_id'];
             $where = SectorComponent::where($sector)->pluck('component_id')->toArray();
             $where = SectorComponent::where($sector)->pluck('component_id')->toArray();
-            $component = Component::whereIn('id',$where)->get()->all();
+            $component = Component::whereIn('component_type',$where)->get()->all();
         }else{
         }else{
             if(isset($data['type_id']) && !empty($data['type_id'])){
             if(isset($data['type_id']) && !empty($data['type_id'])){
                 $where['component.type_id'] = $data['type_id'];
                 $where['component.type_id'] = $data['type_id'];
@@ -2517,12 +2517,9 @@ class PublicRpcService implements PublicRpcServiceInterface
         if(isset($data['page_type']) && !empty($data['page_type'])){
         if(isset($data['page_type']) && !empty($data['page_type'])){
             array_push($where,['page_type', 'like', '%'.$data['page_type'].'%']);
             array_push($where,['page_type', 'like', '%'.$data['page_type'].'%']);
         }
         }
-        if(isset($data['status']) && !empty($data['status'])){
-            array_push($where,['status','!=',0]);
-        }
         $sector = Sector::where($where)
         $sector = Sector::where($where)
-        ->leftJoin('size','sector.size_id','=','size.id')
-        ->select('sector.*','size.width','size.height')
+        // ->leftJoin('size','sector.size_id','=','size.id')
+        ->select('sector.*')
         ->get()->all();
         ->get()->all();
         if(empty($sector)){
         if(empty($sector)){
             return Result::error('通栏不存在!');
             return Result::error('通栏不存在!');