From b7fcf778d32c37340f32aa19db8bcffae4ada964 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 11 Oct 2024 17:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/system/api/domain/SysUser.java    | 12 ++++++++++++
 .../com/bonus/sgzb/system/mapper/SysUserMapper.java  |  2 ++
 .../sgzb/system/service/impl/SysUserServiceImpl.java |  7 ++++++-
 .../main/resources/mapper/system/SysUserMapper.xml   |  9 +++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java
index 2955967e..afa04586 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java
@@ -36,6 +36,18 @@ public class SysUser extends BaseEntity
     @Excel(name = "登录名称")
     private String userName;
 
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     /** 用户昵称 */
     @Excel(name = "用户名称")
     private String nickName;
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java
index 59505d82..b58cfa68 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java
@@ -144,4 +144,6 @@ public interface SysUserMapper
     void updatePurchaseNoticePerson(SysUser user);
 
     String selectPickingFirst(SysUser user);
+
+    String selectRoleName(SysUser sysUser);
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
index 8647a2d4..f81927a9 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
@@ -76,7 +76,12 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
-        return userMapper.selectUserList(user);
+        List<SysUser> sysUsers = userMapper.selectUserList(user);
+        for (SysUser sysUser : sysUsers) {
+            String roleName = userMapper.selectRoleName(sysUser);
+            sysUser.setRoleName(roleName);
+        }
+        return sysUsers;
     }
 
     /**
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
index 4737b0df..ced7bae6 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -291,6 +291,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND u.del_flag = '0'
 		  AND u.user_id = #{userId}
 	</select>
+	<select id="selectRoleName" resultType="java.lang.String">
+		SELECT
+			GROUP_CONCAT( sr.role_name ) as roleName
+		FROM
+			sys_role sr
+				LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
+		WHERE
+			sur.user_id = #{userId}
+	</select>
 
 	<insert id="insertUser" parameterType="com.bonus.sgzb.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(