From 95f9cd8d2f864b73f4a850f85b73424c78cef539 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 09:53:09 +0800 Subject: [PATCH 1/8] =?UTF-8?q?wxcode=E8=8E=B7=E5=8F=96=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=A0=E7=82=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/wxapi/service/impl/WxLoginServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java index ed715cb344..95f8b34591 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java @@ -51,8 +51,10 @@ public class WxLoginServiceImpl implements WxLoginService { String resultStr = HttpClientManager.getInstance().sendGet(WxLoginConstant.WXCODE_BY_OPENID, map).getData(); HashMap hashMap = JSON.parseObject(resultStr, HashMap.class); if (null != hashMap.get("errcode")) { - logger.error("wxcode换取openid接口调用失败"); - throw new RenException(hashMap.get("errmsg")); + //45011:API 调用太频繁，请稍候再试;40029: code 无效 【错误码：https://developers.weixin.qq.com/doc/oplatform/Return_codes/Return_code_descriptions_new.html】 + throw new RenException(String.format("wxcode换取用户基本信息失败，wxcode->%s,错误码->%s,错误信息->%s", wxCode, hashMap.get("errcode"), hashMap.get("errmsg"))); + /*logger.error("wxcode换取openid接口调用失败"); + throw new RenException(hashMap.get("errmsg"));*/ } String openid = hashMap.get("openid"); String sessionKey = hashMap.get("session_key"); From 49867cec12e7b310baee136138b3d942fd9339b5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 11:09:50 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8F=AF=E8=83=9C=E4=BB=BB=E7=BB=84?= =?UTF-8?q?=E9=95=BF-=E7=BB=84=E5=91=98=E5=88=97=E8=A1=A8(=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E9=80=9A=E7=94=A8)=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8C=89=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94=E4=BA=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmetuser/result/UserInfosResultDTO.java | 1 + .../dataaggre/entity/resigroup/ResiGroupEntity.java | 5 +++++ .../service/resigroup/impl/ResiGroupServiceImpl.java | 10 +++++++++- .../resources/mapper/epmetuser/UserBaseInfoDao.xml | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java index 19bfd88186..f4cfd43b40 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java @@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable { private String userId; private String userShowName; private String headPhoto; + private String realName; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java index 7fc47655e4..33b4b9243e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java @@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed */ private String visitSwitch; + + /** + * 小组类型(ordinary:楼院小组 branch:支部小组) + */ + private String groupType; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java index 5e5c727555..253d42f78b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java @@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.resigroup.ResiGroupDao; import com.epmet.dataaggre.dao.resigroup.ResiTopicDao; import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO; +import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO; import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO; import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO; import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO; +import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity; import com.epmet.dataaggre.redis.ResiGroupRedis; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.resigroup.ResiGroupService; @@ -63,12 +65,18 @@ public class ResiGroupServiceImpl implements ResiGroupService { List userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList()); // 查询用户信息【名字 头像】 List userInfos = epmetUserService.selectUserInfosByUserIds(userIds); + //查询小组信息 + ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId()); result.forEach(r -> { if (!CollectionUtils.isEmpty(userInfos)){ userInfos.forEach(u -> { if (r.getUserId().equals(u.getUserId())){ r.setHeadPhoto(u.getHeadPhoto()); - r.setUserShowName(u.getUserShowName()); + if("branch".equals(group.getGroupType())){ + r.setUserShowName(u.getRealName()); + }else { + r.setUserShowName(u.getUserShowName()); + } } }); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 489908227d..7e72f2a85e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -12,7 +12,8 @@ WHEN GENDER = '2' THEN '女士' ELSE '先生/女士' END ) AS userShowName, - HEAD_IMG_URL AS headPhoto + HEAD_IMG_URL AS headPhoto, + REAL_NAME AS realName FROM user_base_info WHERE DEL_FLAG = 0 AND From a34374d01db2e50ba4c81f84b91a4ff9810505f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 13:34:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2-=E5=BE=85=E5=AE=A1=E6=A0=B8/=E5=B7=B2=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=BB=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BF=94=E4=BA=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TopicDraftServiceImpl.java | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java index 25a226886a..7a23edc9cd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.commons.tools.scan.result.VoiceResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.dto.result.AllGridsByUserIdResultDTO; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.GroupMessageDao; @@ -148,6 +149,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl page(Map params) { @@ -630,13 +633,27 @@ public class TopicDraftServiceImpl extends BaseServiceImpl { - ResiGroupMemberInfoRedisDTO memberRedis = - resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); - if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ - item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); - } - }); + //查询小组信息 + ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId()); + if ("branch".equals(group.getGroupType())) { + List userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList()); + List userInfos = resiTopicServiceImpl.disPoseUserInfo(group.getGroupType(), userIds); + result.forEach(item -> { + userInfos.forEach(u->{ + if(item.getUserName().equals(u.getUserId())){ + item.setUserName(u.getReleaseUserName()); + } + }); + }); + } else { + result.forEach(item -> { + ResiGroupMemberInfoRedisDTO memberRedis = + resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName()); + if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ + item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); + } + }); + } return result; } From 33327a22413b11de8959d67e4527265568c45c1a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 13:35:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?showName=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/ResiGroupServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 90b12f3dad..7980a41f14 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 @@ -354,10 +354,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl(); } + // 查询小组信息，为了拿小组的类型，是支部还是楼院 + ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId); UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); resiUserInfoFormDTO.setCustomerId(customerId); resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId()); - return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + Result userResiInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + if (!userResiInfo.success()){ + throw new RenException("根据组id查询组长信息失败了"); + } + if (null != resiGroup && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){ + UserResiInfoResultDTO data = userResiInfo.getData(); + userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName()); + } + return userResiInfo; } /** From bf889acc216a4d65972684b0a0331a7eb0faeabd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 13:52:40 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A4=84=E7=90=86=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=92=8C=E5=A7=93=E5=90=8D=20=E6=8F=90?= =?UTF-8?q?=E6=88=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/topic/service/ResiTopicService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index ed79f489ac..134a4b9885 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.result.FirstTopicShiftedToIssueApplicationResultDTO; +import com.epmet.dto.result.UserInfoResultDTO; import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; @@ -370,4 +371,13 @@ public interface ResiTopicService extends BaseService { * @date 2021/4/21 下午4:08 */ List getPastTopicListV2(GetPastTopicListV2FormDTO formDTO); + + /** + * @Description 查询用户信息【头像，名字】 + * @Param groupType + * @Param userIds + * @author zxc + * @date 2021/4/27 下午1:50 + */ + List disPoseUserInfo(String groupType, List userIds); } From ec39dc6d7576f73cac8c278dd976532c25162ee5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 13:58:18 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A4=84=E7=90=86=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=92=8C=E5=A7=93=E5=90=8D=20=E6=8F=90?= =?UTF-8?q?=E6=88=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 a72be2296d..150dddcb33 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 @@ -2374,6 +2374,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl disPoseUserInfo(String groupType,List userIds){ if (CollectionUtils.isEmpty(userIds)){ return new ArrayList<>(); From 7c5a12c19f48e52708b84a7e6544e15da7271227 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 13:59:09 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notice/service/impl/NoticeReadRecordServiceImpl.java | 4 ++-- .../topic/service/impl/TopicDraftServiceImpl.java | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java index c8c4cc1b1b..fe871a277d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java @@ -32,7 +32,7 @@ import com.epmet.modules.notice.entity.NoticeEntity; import com.epmet.modules.notice.entity.NoticeReadRecordEntity; import com.epmet.modules.notice.redis.NoticeReadRecordRedis; import com.epmet.modules.notice.service.NoticeReadRecordService; -import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl; +import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.resi.group.dto.group.result.UserReadFlagResultDTO; import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO; import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO; @@ -71,7 +71,7 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl page(Map params) { @@ -637,7 +634,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList()); - List userInfos = resiTopicServiceImpl.disPoseUserInfo(group.getGroupType(), userIds); + List userInfos = resiTopicService.disPoseUserInfo(group.getGroupType(), userIds); result.forEach(item -> { userInfos.forEach(u->{ if(item.getUserName().equals(u.getUserId())){ 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 8/8] =?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