From 85845728c255b2006b5554eed729d759aac74515 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 14:04:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A7=93=E5=90=8D=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiGroupMemberServiceImpl.java | 22 +++++++++++++++++-- 1 file changed, 20 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 5f7cd2eb5b..998839dd68 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 @@ -35,6 +35,7 @@ import com.epmet.constant.ReadFlagConstant; import com.epmet.dto.IssueShareLinkVisitRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.UserBaseInfoResultDTO; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -55,6 +56,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService; +import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.EnterGroupTypeConstant; import com.epmet.resi.group.constant.LeaderFlagConstant; @@ -393,9 +395,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + List userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList); + if (CollectionUtils.isEmpty(userInfos)){ + throw new RenException("查询用户信息失败了"); + } + list.forEach(l -> { + userInfos.forEach(u -> { + if (l.getUserId().equals(u.getUserId())){ + l.setUserShowName(u.getReleaseUserName()); + l.setHeadPhoto(u.getReleaseUserHeadPhoto()); + } + }); + }); + /*Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); if(userResiInfoDTOListResult.success()){ for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ for (GroupMemberListResultDTO groupMember : list) { @@ -412,7 +430,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl Date: Tue, 27 Apr 2021 14:21:22 +0800 Subject: [PATCH 2/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> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + ResiGroupEntity resiGroup = resiGroupDao.selectById(applyingMemberFormDTO.getGroupId()); + if (null == resiGroup){ + throw new RenException("此小组信息不存在"); + } + List 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> 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