|
@@ -1014,9 +1014,10 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
->leftJoin('size', 'size.id', '=', 'sector.size_id')
|
|
->leftJoin('size', 'size.id', '=', 'sector.size_id')
|
|
->leftJoin('template', 'template.template_id', '=', 'sector.template_id')
|
|
->leftJoin('template', 'template.template_id', '=', 'sector.template_id')
|
|
->leftJoin('template_class', 'template_class.class_id', '=', 'template.template_class_id')
|
|
->leftJoin('template_class', 'template_class.class_id', '=', 'template.template_class_id')
|
|
|
|
+ ->leftJoin('sector_place', 'sector_place.sector_type', '=', 'sector.place_type')
|
|
->where($where)
|
|
->where($where)
|
|
- ->select('sector.*', 'size.width','size.height','template_class.name as class_name','template.template_name')
|
|
|
|
-
|
|
|
|
|
|
+ ->select('sector.*', 'size.width','size.height','template_class.name as class_name','template.template_name'
|
|
|
|
+ ,'sector_place.name as place_name','sector_place.sector_img as place_img')
|
|
->orderBy('sector.id', 'desc')
|
|
->orderBy('sector.id', 'desc')
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
if(empty($result)){
|
|
if(empty($result)){
|