|
|
@ -505,10 +505,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
Collections.EMPTY_LIST : |
|
|
|
badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList()) |
|
|
|
); |
|
|
|
} else top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
} else { |
|
|
|
top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
} else latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
} else { |
|
|
|
latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -578,10 +582,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
Collections.EMPTY_LIST : |
|
|
|
badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList()) |
|
|
|
); |
|
|
|
}else top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
}else { |
|
|
|
top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
}else pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
}else { |
|
|
|
pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -1046,10 +1054,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
Collections.EMPTY_LIST : |
|
|
|
badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList()) |
|
|
|
); |
|
|
|
} else top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
} else { |
|
|
|
top.setBadgeList(Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
} else hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
} else { |
|
|
|
hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -1904,6 +1916,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class); |
|
|
|
} |
|
|
|
|
|
|
|
}else { |
|
|
|
throw new RenException(dataFilterResult.getMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
}else { |
|
|
|
throw new RenException(dataFilterResult.getMsg()); |
|
|
|
} |
|
|
@ -2193,7 +2209,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
Optional.ofNullable(param.getPageSize()).orElse(NumConstant.ONE)).doSelectPageInfo(() -> |
|
|
|
baseDao.selectParticipatedTopics(param.getCustomerId(),param.getUserId())); |
|
|
|
List<ParticipatedTopicUnitResultDTO> result = page.getList(); |
|
|
|
if(CollectionUtils.isEmpty(result)) return Collections.EMPTY_LIST; |
|
|
|
if(CollectionUtils.isEmpty(result)) { |
|
|
|
return Collections.EMPTY_LIST; |
|
|
|
} |
|
|
|
Result<List<OrgInfoResultDTO>> gridR = govOrgOpenFeignClient.selectOrgInfo( |
|
|
|
new OrgInfoFormDTO(OrgInfoConstant.GRID,result.stream().map(ParticipatedTopicUnitResultDTO :: getTopicReleaseGridName).distinct().collect(Collectors.toList()))); |
|
|
|
if(gridR.success() && !CollectionUtils.isEmpty(gridR.getData())){ |
|
|
@ -2260,7 +2278,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
List<IssueApplicationDTO> applications = reply.getData(); |
|
|
|
|
|
|
|
return StringUtils.equals(ModuleConstant.TOPIC_SHIFTED_TO_ISSUE_STATUS_UNDER_AUDITING,applications.get(NumConstant.ZERO).getApplyStatus()) ? true : false; |
|
|
|
}else return false; |
|
|
|
}else { |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
log.error("Method [checkTopicIfUnderAuditing] of service gov-issue called failed,topicId is [%s]",topicId); |
|
|
|
throw new RenException(reply.getInternalMsg()); |
|
|
@ -2563,6 +2583,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
List<UserInfoResultDTO> userInfos = this.disPoseUserInfo(resiGroup.getGroupType(), userIds); |
|
|
|
// 根据用户ID和【活动、通知ID】查询阅读状态
|
|
|
|
List<ReadStatusResultDTO> readStatus = resiGroupDao.selectReadFlagByUserAndId(ids, userIds); |
|
|
|
// 查询小组下的 通知或活动 未读人数
|
|
|
|
List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(formDTO.getGroupId(), ids); |
|
|
|
// 查询用户徽章信息
|
|
|
|
Result<List<UserBadgesResultDTO>> badgeResult = epmetUserOpenFeignClient.userBadges(new UserBadgesFormDTO(formDTO.getCustomerId(),userIds)); |
|
|
|
if (!badgeResult.success()){ |
|
|
@ -2604,6 +2626,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
//
|
|
|
|
if (!CollectionUtils.isEmpty(userUnReadCount)){ |
|
|
|
userUnReadCount.forEach(u -> { |
|
|
|
if (i.getId().equals(u.getId())){ |
|
|
|
i.setUnReadCount(u.getUnRead()); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
|
return infos; |
|
|
|
} |
|
|
|