|
@@ -220,6 +220,12 @@ public class WorkWechatServiceImpl implements WorkWechatService {
|
|
|
private Map<String, String> getRoomTipInfoMap() {
|
|
|
WorkWechatRoomInfoExample example = new WorkWechatRoomInfoExample();
|
|
|
List<WorkWechatRoomInfo> workWechatRoomInfos = workWechatRoomInfoMapper.selectByExample(example);
|
|
|
- return workWechatRoomInfos.stream().collect(Collectors.toMap(WorkWechatRoomInfo::getRoomId, WorkWechatRoomInfo::getTipinfo, (o1, o2) -> o2));
|
|
|
+ return workWechatRoomInfos.stream()
|
|
|
+ .filter(room -> room.getRoomId() != null)
|
|
|
+ .collect(Collectors.toMap(
|
|
|
+ WorkWechatRoomInfo::getRoomId,
|
|
|
+ room -> Optional.ofNullable(room.getTipinfo()).orElse(""), // 使用 Optional 处理 null
|
|
|
+ (o1, o2) -> o2
|
|
|
+ ));
|
|
|
}
|
|
|
}
|