diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index d4fcb3ae92..f8a9127c08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; @@ -341,16 +342,27 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 - if("publish".equals(formDTO.getType())){ + if ("publish".equals(formDTO.getType())) { //查询活动对应的发布范围信息 LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); orgWrapper.eq(IcPartyActOrgEntity::getDelFlag, NumConstant.ZERO_STR); @@ -360,19 +372,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyOrgIdList = list.stream().filter(ca -> !ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); //分别查询党组织、党小组下的人 List userIdList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { //TODO } //组装消息 - userIdList.forEach(id->{ + for (String id : userIdList){ UserMessageFormDTO msg = new UserMessageFormDTO(); msg.setCustomerId(formDTO.getCustomerId()); msg.setApp(AppClientConstant.APP_RESI); @@ -385,7 +397,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl