diff --git a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue index 7bc11b8b..749219bc 100644 --- a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue +++ b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue @@ -149,6 +149,8 @@ if(pageName == '市场人员列表'){ }else if(pageName == '销售人员列表'){ initialFormData.dept_id = 2; // campusPersonRoleTable.searchParam.role_id = 2; +}else if(pageName == '教练管理'){ + initialFormData.dept_id = 3; } const formData: Record = reactive({ ...initialFormData }) diff --git a/niucloud/app/service/admin/auth/AuthService.php b/niucloud/app/service/admin/auth/AuthService.php index ec9c9c58..c2b014d8 100644 --- a/niucloud/app/service/admin/auth/AuthService.php +++ b/niucloud/app/service/admin/auth/AuthService.php @@ -11,6 +11,8 @@ namespace app\service\admin\auth; +use app\model\campus_person_role\CampusPersonRole; +use app\model\personnel\Personnel; use app\Request; use app\service\admin\sys\MenuService; use app\service\admin\sys\RoleService; @@ -91,7 +93,12 @@ class AuthService extends BaseAdminService if ($is_admin) {//查询全部启用的权限 return ( new MenuService() )->getAllMenuList($status, $is_tree, $is_button); } else { - $user_role_ids = $user_info[ 'role_ids' ]; + $per = new Personnel(); + $CampusPersonRole = new CampusPersonRole(); + $per_id = $per->where(['sys_user_id' => $this->uid])->column('id'); + + $user_role_ids = $CampusPersonRole->where(['person_id' => $per_id])->column('role_id'); +// $role_service = new RoleService(); $menu_keys = $role_service->getMenuKeysByRoleIds($user_role_ids ?? []); return $menu_service->getMenuListByMenuKeys($menu_keys, $is_tree, is_button:$is_button); diff --git a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php index c16555c9..f6fa7706 100644 --- a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php +++ b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php @@ -93,6 +93,8 @@ class CampusPersonRoleService extends BaseAdminService public function add(array $data) { $res = $this->model->create($data); + + return $res->id; }