From 6551e8a9ab9c2cbd1c556f785725fa6bfe8ecf20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 10 Nov 2023 17:30:22 +0800
Subject: [PATCH] fix:78420

---
 .../modules/sys/entity/LawsWorkingGroup.java  |  6 ++++++
 .../impl/LawsWorkingGroupServiceImpl.java     | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
index 07bc5616..bf419de8 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
@@ -81,4 +81,10 @@ public class LawsWorkingGroup implements Serializable {
 
     @TableField(exist = false)
     private List<LawsWorkingGroup> subset;
+
+    /**
+     * 真实姓名（用户名）
+     */
+    @TableField(exist = false)
+    private String userName;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java
index a05b4ba8..6c069680 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupServiceImpl.java
@@ -5,6 +5,9 @@ import com.jero.common.constant.CommonConstant;
 import com.jero.modules.sys.entity.LawsWorkingGroup;
 import com.jero.modules.sys.mapper.LawsWorkingGroupMapper;
 import com.jero.modules.sys.service.ILawsWorkingGroupService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +18,8 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 
 /**
  * @Description: 内部工作组
@@ -26,6 +31,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMapper, LawsWorkingGroup> implements ILawsWorkingGroupService {
 
+	@Resource
+	private ISysUserService sysUserService;
+
     /**
      * 列表查询
      */
@@ -149,21 +157,26 @@ public class LawsWorkingGroupServiceImpl extends ServiceImpl<LawsWorkingGroupMap
 			return new ArrayList<>();
 		}
 		List<LawsWorkingGroup> treeList = new ArrayList<>();
+		List<SysUser> listSysUser = sysUserService.list();
 		for (LawsWorkingGroup group : list) {
 			if (StringUtils.isBlank(group.getPid())) {
 				group.setLevel(1);
-				addChildGroups(group, list);
+				addChildGroups(group, list, listSysUser);
 				treeList.add(group);
 			}
 		}
 		return treeList;
 	}
-	private void addChildGroups(LawsWorkingGroup parentGroup, List<LawsWorkingGroup> list) {
+	private void addChildGroups(LawsWorkingGroup parentGroup, List<LawsWorkingGroup> list, List<SysUser> listSysUser) {
 		List<LawsWorkingGroup> childGroups = new ArrayList<>();
 		for (LawsWorkingGroup group : list) {
 			if (StringUtils.isNotBlank(group.getPid()) && parentGroup.getId().equals(group.getPid())) {
 				group.setLevel(parentGroup.getLevel() + 1);
-				addChildGroups(group, list);
+				if(!CollectionUtils.isEmpty(listSysUser) && !StringUtils.isBlank(group.getUserId())){
+					Optional<SysUser> op = listSysUser.stream().filter(o->Objects.equals(o.getId(),group.getUserId())).findFirst();
+					op.ifPresent(sysUser -> group.setUserName(sysUser.getRealname() + "(" + sysUser.getUsername() + ")"));
+				}
+				addChildGroups(group, list, listSysUser);
 				childGroups.add(group);
 			}
 		}