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