|
|
@@ -626,11 +626,15 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
if (!empty($data['component_name'])) {
|
|
|
$where['component.component_name'] = $data['component_name'];
|
|
|
}
|
|
|
+ if (!empty($data['sector_id'])) {
|
|
|
+ $where['sector.id'] = $data['sector_id'];
|
|
|
+ };
|
|
|
+
|
|
|
$result = Component::where($where)
|
|
|
->leftJoin('template', 'template.id', '=', 'component.template_id')
|
|
|
->leftJoin('template_class', 'template_class.id', '=', 'template.template_class_id') // 添加这一行
|
|
|
->leftJoin('sector', 'sector.id', '=', 'component.sector_id')
|
|
|
- ->select('template_class.name as template_class_name', 'template.template_name as template_name', 'template_class.id as template_class_id', 'sector.sector_name as sector_name', 'component.*')
|
|
|
+ ->select('template_class.name as template_class_name', 'template.template_name as template_name', 'template_class.id as template_class_id', 'sector.sector_name as sector_name', 'component.*', 'sector.id as sector_id') // 修改这一行)
|
|
|
->orderBy('sector.updated_at', 'desc')
|
|
|
->orderBy('sector.created_at', 'desc')
|
|
|
->paginate($data['page_size'], ['*'], 'mypage_name', $data['page']);
|
AI