diff --git a/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php b/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php index 6b1f4019..5b41b312 100644 --- a/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php +++ b/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php @@ -95,7 +95,10 @@ class CampusPersonRole extends BaseAdminController } public function getPersonnelAll(){ - return success(( new CampusPersonRoleService())->getPersonnelAll()); + $data = $this->request->params([ + ["campus_id",0] + ]); + return success(( new CampusPersonRoleService())->getPersonnelAll($data['campus_id'])); } public function getSysRoleAll(){ diff --git a/niucloud/app/adminapi/controller/personnel/Personnel.php b/niucloud/app/adminapi/controller/personnel/Personnel.php index e82ff02c..021b808a 100644 --- a/niucloud/app/adminapi/controller/personnel/Personnel.php +++ b/niucloud/app/adminapi/controller/personnel/Personnel.php @@ -68,6 +68,7 @@ class Personnel extends BaseAdminController ["id_card_back",""], ["status",0], ["is_sys_user",0], + ["campus_id",0], ["info",[]], ["use_approval", 0], // 是否使用审批流程 ["approval_config_id", 0], // 审批配置ID @@ -110,6 +111,7 @@ class Personnel extends BaseAdminController ["id_card_front",""], ["id_card_back",""], ["status",0], + ["campus_id",0], ["is_sys_user",0], ["info",[]], diff --git a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php index d7a1a6a1..c9d9ea63 100644 --- a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php +++ b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php @@ -163,12 +163,13 @@ class CampusPersonRoleService extends BaseAdminService return $campusModel->select()->toArray(); } - public function getPersonnelAll(){ - $person_ids = $this->model->column("person_id"); - - + public function getPersonnelAll($campus_id){ $personnelModel = new Personnel(); - return $personnelModel->where([['id','not in',$person_ids]])->select()->toArray(); + return $personnelModel->when($campus_id, function ($query) use ($campus_id) { + $query->where('campus_id', $campus_id); + })->where('status',2) + ->select() + ->toArray(); } public function getSysRoleAll($data){ @@ -181,12 +182,12 @@ class CampusPersonRoleService extends BaseAdminService ->where('role_key', '<>', '') ->where('role_name', '<>', '超级管理员'); }); - + // 如果dept_id不为0,则按部门过滤;如果为0则显示所有可用角色 if (isset($data['dept_id']) && $data['dept_id'] > 0) { $query->where('dept_id', $data['dept_id']); } - + return $query->select()->toArray(); }