From ee4a8d7570ba82259ea71cbbb45fc59943fdd6bb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 27 Apr 2021 14:21:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E7=BB=84=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E5=A7=93=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResiGroupMemberServiceImpl.java      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 998839dd68..14f1f623e6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -474,7 +474,23 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		}
 		UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
 		formDTO.setUserIdList(userIdList);
-		Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+		ResiGroupEntity resiGroup = resiGroupDao.selectById(applyingMemberFormDTO.getGroupId());
+		if (null == resiGroup){
+			throw new RenException("此小组信息不存在");
+		}
+		List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList);
+		if (CollectionUtils.isEmpty(userInfos)){
+			throw new RenException("查询用户信息失败了");
+		}
+		list.forEach(l -> {
+			userInfos.forEach(u -> {
+				if (l.getApplyUserId().equals(u.getUserId())){
+					l.setApplyUserName(u.getReleaseUserName());
+					l.setApplyUserHeadPhoto(u.getReleaseUserHeadPhoto());
+				}
+			});
+		});
+		/*Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
 		if(userResiInfoDTOListResult.success()){
 			for (ApplyingMemberResultDTO memberInfo : list) {
 				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
@@ -487,7 +503,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			}
 		}else{
 			logger.warn(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
-		}
+		}*/
 
 
 		//徽章信息

From eb01bb194744c175db568172e685d9dfc40ce6cd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Apr 2021 14:25:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=8C=89?=
 =?UTF-8?q?=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94=E4=BA=BA=E5=90=8D=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 150dddcb33..e7a6e1ad55 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -192,6 +192,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
+    @Autowired
+    private ResiTopicService resiTopicService;
+
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
@@ -868,7 +871,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                             Collections.EMPTY_LIST:
                             badgeR.getData().get(topicDetail.getCreatedBy()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList())
             );
-        }else resultDTO.setBadgeList(Collections.EMPTY_LIST);
+        } else {
+            resultDTO.setBadgeList(Collections.EMPTY_LIST);
+        }
         return new Result<ResiTopicIncludeIssueDetailResultDTO>().ok(resultDTO);
     }
 
@@ -893,8 +898,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
         //2.遍历用户信息
         if (null != hiddenTopics && hiddenTopics.size() > 0) {
-            setCacheUserInfo(topicPageFormDTO.getGroupId(), hiddenTopics);
-
+            //获取小组信息
+            ResiGroupEntity groupEntity = resiGroupDao.selectById(topicPageFormDTO.getGroupId());
+            if ("branch".equals(groupEntity.getGroupType())) {
+                List<String> userIds = hiddenTopics.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList());
+                List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(groupEntity.getGroupType(), userIds);
+                hiddenTopics.forEach(item -> {
+                    userInfos.forEach(u->{
+                        if(item.getUserId().equals(u.getUserId())){
+                            //缓存中有该用户信息
+                            item.setReleaseUserName(u.getReleaseUserName());
+                            item.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto());
+                        }
+                    });
+                });
+            } else {
+                setCacheUserInfo(topicPageFormDTO.getGroupId(), hiddenTopics);
+            }
 
             //3.用户徽章
             //3.1首先需要拿到客户Id
@@ -1650,7 +1670,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     if (operationResult != NumConstant.ONE) {
                         logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
                     }
-                } else logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+                } else {
+                    logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+                }
                 //7.更新组统计信息 议题数量+1
                 resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
                 if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {