|
|
@@ -276,7 +276,9 @@ public class QwSopTempServiceImpl implements IQwSopTempService
|
|
|
Map<Long, List<QwSopTempContent>> contentMap = PubFun.listToMapByGroupList(contentList, QwSopTempContent::getRulesId);
|
|
|
rulesList.forEach(e -> {
|
|
|
List<QwSopTempContent> contents = contentMap.get(e.getId());
|
|
|
- e.setSetting(contents.stream().map(c -> JSON.parseObject(c.getContent())).collect(Collectors.toList()));
|
|
|
+ if (CollectionUtils.isNotEmpty(contents)){
|
|
|
+ e.setSetting(contents.stream().map(c -> JSON.parseObject(c.getContent())).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
day.setList(rulesList);
|