|
@@ -979,7 +979,9 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
$query->whereIn('size_id', $size_id);
|
|
|
})
|
|
|
->leftJoin('size', 'size.id', '=', 'sector.size_id')
|
|
|
- ->select('sector.*', 'size.width','size.height')
|
|
|
+ ->leftJoin('template_class', 'template_class.class_id', '=', 'sector.template_class_id')
|
|
|
+ ->leftJoin('template', 'template.template_id', '=', 'sector.template_id')
|
|
|
+ ->select('sector.*', 'size.width','size.height','template_class.name as class_name','template.template_name')
|
|
|
->orderBy('sector.id', 'desc')
|
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
|
return Result::success($result);
|