From 80d0643d11315ad0863c348bfe49063617dbbfec Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 28 Apr 2021 15:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91-?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E6=8C=89?=
 =?UTF-8?q?=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E4=BA=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 1c6cc3f142..bf50316c61 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -62,6 +62,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.*;
 import com.epmet.resi.group.dto.UserRoleDTO;
@@ -164,6 +165,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
+	@Autowired
+	private ResiTopicService resiTopicService;
 
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@@ -993,7 +996,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public List<String> getGroupIdByGridId(String gridId) {
-		if(StringUtils.isBlank(gridId)) return null;
+		if(StringUtils.isBlank(gridId)) {
+			return null;
+		}
 		return baseDao.getGroupIdByGridId(gridId);
 	}
 
@@ -1483,7 +1488,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
         _update.setId(edit.getId());_update.setReadFlag(ModuleConstant.READ);
         groupEditSubmitRecordDao.updateById(_update);
         GroupEditionDetailResultDTO result = ConvertUtils.sourceToTarget(edit, GroupEditionDetailResultDTO.class);
-        result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+        ResiGroupEntity entity = resiGroupDao.selectById(param.getGroupId());
+        if("branch".equals(entity.getGroupType())){
+			List<String> userIds = new ArrayList<>();
+			userIds.add(edit.getCreatedBy());
+			List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds);
+			userInfos.forEach(u->{
+				if(edit.getCreatedBy().equals(u.getUserId())){
+					result.setGroupLeaderName(u.getReleaseUserName());
+				}
+			});
+		} else {
+			result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+		}
         return result;
 	}