Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/zhjwxt

niucloud/app/service/api/apiService/PersonnelService.php

@@ -48,7 +48,14 @@ class PersonnelService extends BaseApiService
         $role_id = array_unique(array_column($campus_person_role, 'role_id'));
         $dept_id = array_unique(array_column($campus_person_role, 'dept_id'));
         //查询用户角色
-        $role_name_arr = SysRole::whereIn('role_id',$role_id)->column('role_name');
+        $role = SysRole::whereIn('role_id',$role_id)->where('status',1)->field('role_id,role_name,role_key,addon_keys,status')->select()->toArray();
+        $role_name_arr = [];
+        $role_key_arr = [];
+        foreach($role as $v){
+            $role_name_arr[] = $v['role_name'];
+            $role_key_arr[] = $v['role_key'];
+        }
+
         $role_name_str = implode(',',$role_name_arr);//
 
         //查询部门
@@ -58,7 +65,9 @@ class PersonnelService extends BaseApiService
 
         if($res){
             $res = $res->toArray();
+            $res['role']=$role;
             $res['role_name_str'] = $role_name_str;
+            $res['role_key_arr'] = $role_key_arr;
             $res['department_name_str'] = $department_name_str;
 
         }else{