From c759174407ede1c68ccaa547bf716c995fc13f09 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 19 May 2025 11:41:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(PersonnelService):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=92=8C=E8=A7=92=E8=89=B2=E9=94=AE=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 查询用户角色时，增加了状态筛选（status=1）和更多字段（role_key, addon_keys）
- 新增 role_key_arr 数组，用于存储用户角色键
- 在返回结果中添加角色详细信息和角色键数组
---
 .../app/service/api/apiService/PersonnelService.php   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/niucloud/app/service/api/apiService/PersonnelService.php b/niucloud/app/service/api/apiService/PersonnelService.php
index c8c7ab54..1dbde67c 100644
--- a/niucloud/app/service/api/apiService/PersonnelService.php
+++ b/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{