|
|
@@ -91,11 +91,20 @@ public class WeComSendMsgJob {
|
|
|
continue;
|
|
|
}
|
|
|
List<ThirdPartWeComRoom> roomList = weComThirdPartyService.getStaffRoomList(staff.getId());
|
|
|
+ if (CollectionUtils.isEmpty(roomList)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
List<Long> roomIds = roomList.stream().map(ThirdPartWeComRoom::getId).collect(Collectors.toList());
|
|
|
List<ThirdPartWeComRoomConfig> roomConfigList = weComThirdPartyRoomService.getRoomConfigListByRoomIds(roomIds);
|
|
|
+ if (CollectionUtils.isEmpty(roomConfigList)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
Map<Long, ThirdPartWeComRoomConfig> roomConfigMap = roomConfigList.stream().collect(Collectors.toMap(ThirdPartWeComRoomConfig::getRoomId, a -> a));
|
|
|
List<String> configIds = roomConfigList.stream().map(ThirdPartWeComRoomConfig::getId).map(String::valueOf).collect(Collectors.toList());
|
|
|
List<ThirdPartWeComRoomConfigTask> roomConfigTaskList = weComThirdPartyRoomService.getRoomConfigTasks(configIds);
|
|
|
+ if (CollectionUtils.isEmpty(roomConfigTaskList)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
Map<String, List<ThirdPartWeComRoomConfigTask>> roomConfigTaskMap = roomConfigTaskList.stream()
|
|
|
.filter(o -> o.getSwitchFlag() == 1).collect(Collectors.groupingBy(ThirdPartWeComRoomConfigTask::getConfigId));
|
|
|
for (ThirdPartWeComRoom room : roomList) {
|
|
|
@@ -113,6 +122,9 @@ public class WeComSendMsgJob {
|
|
|
}
|
|
|
List<String> configTaskIds = taskList.stream().map(ThirdPartWeComRoomConfigTask::getId).collect(Collectors.toList());
|
|
|
List<ThirdPartWeComRoomConfigTaskContent> taskContentList = weComThirdPartyRoomService.getRoomConfigTaskContents(configTaskIds);
|
|
|
+ if (CollectionUtils.isEmpty(taskContentList)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
Map<String, List<ThirdPartWeComRoomConfigTaskContent>> taskContentMap = taskContentList.stream()
|
|
|
.collect(Collectors.groupingBy(ThirdPartWeComRoomConfigTaskContent::getTaskId));
|
|
|
ThirdPartWeComStaff pushStaff = getSendStaff(roomConfig);
|