Commit ef7991f7 by 吕明尚

修改当门店下没房间时没保洁负责门店

parent 4eb6a013
...@@ -392,7 +392,12 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme ...@@ -392,7 +392,12 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
wrapper.orderByAsc(SOrder::getEndDate); wrapper.orderByAsc(SOrder::getEndDate);
List<SOrder> list = orderService.list(wrapper); List<SOrder> list = orderService.list(wrapper);
Optional.ofNullable(storeList).orElse(new ArrayList<>()).forEach(item -> { Optional.ofNullable(storeList).orElse(new ArrayList<>()).forEach(item -> {
item.setRoolList(roomMap.get(item.getId())); List<SRoomVo> sRoomVos = roomMap.get(item.getId());
if (CollectionUtils.isEmpty(sRoomVos)) {
item.setRoolList(new ArrayList<>());
return;
}
item.setRoolList(sRoomVos);
item.getRoolList().forEach(room -> { item.getRoolList().forEach(room -> {
if (CollectionUtils.isNotEmpty(sCleanRecordsList)) { if (CollectionUtils.isNotEmpty(sCleanRecordsList)) {
if (CollectionUtils.isNotEmpty(recordsMap.get(room.getId()))) { if (CollectionUtils.isNotEmpty(recordsMap.get(room.getId()))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment