From 5a3ea3c6c4867e844f0e421d56046149847c88b4 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Fri, 2 Aug 2024 16:53:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=9B=E5=BB=BA=E4=BA=BA=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/modules/sys/entity/SysGroup.java   | 4 ++++
 .../java/com/jero/modules/sys/mapper/xml/SysGroupMapper.xml   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/SysGroup.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/SysGroup.java
index 7073a2fc..4fafc281 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/entity/SysGroup.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/SysGroup.java
@@ -73,4 +73,8 @@ public class SysGroup implements Serializable {
     @ApiModelProperty("是否拥有管理员身份 0-否 1-是")
     private String isAdmin;
 
+    @TableField(exist = false)
+    @ApiModelProperty("创建人的真实姓名(工号)")
+    private String createUserName;
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/sys/mapper/xml/SysGroupMapper.xml b/laws-modules/src/main/java/com/jero/modules/sys/mapper/xml/SysGroupMapper.xml
index f358fc52..7c80aead 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/mapper/xml/SysGroupMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/sys/mapper/xml/SysGroupMapper.xml
@@ -11,6 +11,7 @@
             count(sug.id) as count,
             GROUP_CONCAT(sug.user_id) as ids,
             GROUP_CONCAT(CONCAT(su.realname, '(', su.username, ')') ORDER BY su.realname, su.username) as userNames,
+            CONCAT(su2.realname, '(', su2.username, ')') as createUserName,
             CASE
             WHEN sg.create_by = #{sysGroup.currentUserName} THEN 1
             ELSE 0
@@ -18,6 +19,7 @@
         from sys_group sg
                  LEFT JOIN sys_user_group sug on sg.id = sug.group_id
                  LEFT JOIN sys_user su on sug.user_id = su.id
+                 LEFT JOIN sys_user su2 on sg.create_by = su2.username
     <where>
         <if test="sysGroup.groupName != null and sysGroup.groupName != ''">
             AND sg.group_name LIKE CONCAT('%',CONCAT(#{sysGroup.groupName},'%'))