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] =?UTF-8?q?=E5=85=A5=E7=BB=84=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=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()));
-		}
+		}*/
 
 
 		//徽章信息