From 75a2469aba09d565defdc9f6c79fc8b96e161f3f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 28 Apr 2021 14:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AE=A1=E7=90=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9C=9F=E5=AE=9E=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    | 26 ++++++++++++++-----
 .../service/impl/NoticeServiceImpl.java       |  4 +--
 2 files changed, 22 insertions(+), 8 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 7980a41f14..1c6cc3f142 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
@@ -37,6 +37,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -855,12 +856,24 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
 		resultDTO.setTotalTopics(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalTopics());
 
-		//获取组长信息
+		//根据组类型判断是否返真实姓名
+		ResiGroupEntity entity = resiGroupDao.selectById(resiGroupInfoRedisDTO.getGroupId());
 		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(formDTO.getGroupId());
-		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
-			resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+		if("branch".equals(entity.getGroupType())){
+			//获取组长信息
+			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+				String street = groupLeaderUserInfo.getData().getStreet() == null ? "" : groupLeaderUserInfo.getData().getStreet() + "-";
+				resultDTO.setLeaderName(street + groupLeaderUserInfo.getData().getSurname() + groupLeaderUserInfo.getData().getName());
+			} else {
+				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
+			}
 		} else {
-			logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
+			//获取组长信息
+			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+				resultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+			} else {
+				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), formDTO.getGroupId());
+			}
 		}
 
 		return new Result<GovGroupSummarizeResultDTO>().ok(resultDTO);
@@ -993,8 +1006,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 **/
 	@Override
 	public Map<String, Set<String>> getGroupIdsByGridIdList(List<String> gridIdList) {
-		if(null == gridIdList || gridIdList.size() < NumConstant.ONE)
-		return null;
+		if(null == gridIdList || gridIdList.size() < NumConstant.ONE){
+			return null;
+		}
 		Map<String, Set<String>> result = new HashMap<>();
 		List<ResiGroupDTO> groups = new ArrayList<>();
 		Map<String,List<ResiGroupDTO>> groupMap
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
index 36a20ffde6..c0e8521ef2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java
@@ -479,8 +479,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 url.append(user.getHeadImgUrl());
             }
         });
-        resultDTO.setReleaseUserName(name.toString());
-        resultDTO.setReleaseUserHeadPhoto(url.toString());
+        resultDTO.setReleaseUserName(String.valueOf(name));
+        resultDTO.setReleaseUserHeadPhoto(String.valueOf(url));
         fileList.forEach(f -> {
             if ("image".equals(f.getType())) {
                 imageList.add(f);