Commit da387aba by wuwenlong

Merge remote-tracking branch 'origin/main'

parents 66882c4e 94e3516e
...@@ -315,10 +315,13 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme ...@@ -315,10 +315,13 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
item.setRoolList(roomMap.get(item.getId())); item.setRoolList(roomMap.get(item.getId()));
item.getRoolList().forEach(room -> { item.getRoolList().forEach(room -> {
if (CollectionUtils.isNotEmpty(sCleanRecordsList)) { if (CollectionUtils.isNotEmpty(sCleanRecordsList)) {
if (CollectionUtils.isNotEmpty(recordsMap.get(room.getId()))) {
SCleanRecords records = recordsMap.get(room.getId()).get(0); SCleanRecords records = recordsMap.get(room.getId()).get(0);
room.setRecordsStatus(records.getStatus()); room.setRecordsStatus(records.getStatus());
room.setRecordsId(records.getId()); room.setRecordsId(records.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