diff --git a/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php b/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php index f84b1ebe..56c37f0b 100644 --- a/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php +++ b/niucloud/app/adminapi/controller/customer_resources/CustomerResources.php @@ -37,6 +37,7 @@ class CustomerResources extends BaseAdminController ["type", "khzy"], ["created_at", []], ["updated_at", []], + ["campus_name",""] ]); return success((new CustomerResourcesService())->getPage($data)); } diff --git a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php index 82a80a01..fac1f822 100644 --- a/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php +++ b/niucloud/app/service/admin/customer_resources/CustomerResourcesService.php @@ -51,7 +51,7 @@ class CustomerResourcesService extends BaseAdminService public function getPage(array $data = []) { // dump($data);die; - $field = 'a.*,b.id as shared_id'; + $field = 'a.*,b.id as shared_id,c.campus_name'; $order = 'a.id desc'; $where = []; if ($data['phone_number']) { @@ -78,12 +78,18 @@ class CustomerResourcesService extends BaseAdminService $where[] = ['a.member_label', 'like', "%" . $data['member_label'] . "%"]; } + if ($data['campus_name']) { + $where[] = ['c.campus_name', 'like', "%" . $data['campus_name'] . "%"]; + } + $search_model = $this->model ->alias("a") ->join(['school_resource_sharing' => 'b'], 'a.id = b.resource_id', 'left') + ->join(['school_campus' => 'c'], 'a.campus = c.id', 'left') ->where($where) - ->with(['personnel'])->field($field)->order($order); + ->with(['personnel']) + ->field($field)->order($order); if (isset($data['created_at'][0]) && isset($data['created_at'][1])) {