|
@@ -2411,6 +2411,15 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
$sector_place = SectorPlace::where($where)
|
|
$sector_place = SectorPlace::where($where)
|
|
// ->select('sector_place.*','size.width','size.height')
|
|
// ->select('sector_place.*','size.width','size.height')
|
|
->get()->all();
|
|
->get()->all();
|
|
|
|
+ if($data['type_id'] == 2){
|
|
|
|
+ foreach($sector_place as $key => $value){
|
|
|
|
+ $sector_place[$key]['component'] = Component::where('type_id',$value['type'])
|
|
|
|
+ ->where('component_width',$value['width'])
|
|
|
|
+ ->where('component_height',$value['height'])
|
|
|
|
+ ->get()->all();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if(empty($sector_place)){
|
|
if(empty($sector_place)){
|
|
return Result::error('通栏版式不存在!');
|
|
return Result::error('通栏版式不存在!');
|
|
}
|
|
}
|