From 48b05487f0ec1e6e36e83f57dbdb1f7071782af1 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Thu, 13 Jun 2024 17:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=86=E7=BB=84=E5=8F=8A=E7=94=A8=E6=88=B7=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/common/system/mapper/xml/UserMapper.xml   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index a5ddf05..a51c7df 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -26,7 +26,9 @@
     <sql id="selectSql">
         SELECT a.*,
         b.organization_name,
-        c.dict_data_name sex_name
+        c.dict_data_name sex_name,
+        e.name as groupName,
+        f.name as gradeName
         FROM sys_user a
         LEFT JOIN sys_organization b ON a.organization_id = b.organization_id
         LEFT JOIN (
@@ -35,6 +37,8 @@
         LEFT JOIN(
         <include refid="selectUserRoleSql"/>
         ) d ON a.user_id = d.user_id
+        LEFT JOIN sys_user_group e ON a.group_id = e.group_id
+        LEFT JOIN sys_user_grade f ON a.grade_id = f.grade_id
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}