|
|
@@ -563,16 +563,23 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
{
|
|
|
$where = [];
|
|
|
if (!empty($data['template_class_id'])) {
|
|
|
- $where['template_class_id'] = $data['template_class_id'];
|
|
|
+ $where['template_class.id'] = $data['template_class_id'];
|
|
|
}
|
|
|
- if (!empty($data['template_name'])) {
|
|
|
- $where['template_name'] = $data['template_name'];
|
|
|
+ if (!empty($data['template_class_name'])) {
|
|
|
+ $where[] = ['template_class.name', 'like', '%' . $data['template_class_name'] . '%'];
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!empty($data['sector_name'])) {
|
|
|
+ if (!empty($data['sector_name'])) {
|
|
|
+ // $where['sector_name'] = $data['sector_name'];
|
|
|
+ $where[] = ['sector.sector_name', 'like', '%' . $data['sector_name'] . '%'];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
$result = Sector::where($where)
|
|
|
->leftJoin('template', 'template.id', '=', 'sector.template_id')
|
|
|
- ->leftJoin('template_class', 'template_class.id', '=', 'template.template_class_id') // 添加这一行
|
|
|
- ->select('sector.*', 'template.template_name', 'template_class.name as template_class_name', 'template_class.id as template_class_id') // 修改这一行
|
|
|
+ ->leftJoin('template_class', 'template_class.id', '=', 'sector.template_id') // 添加这一行
|
|
|
+ ->select('sector.*', 'sector.sector_name', 'template.template_name', 'template_class.name as template_class_name', 'template_class.id as template_class_id') // 修改这一行
|
|
|
->orderBy('sector.id', 'desc')
|
|
|
->paginate($data['page_size'], ['*'], 'mypage_name', $data['page']);
|
|
|
|
AI