yfh преди 3 месеца
родител
ревизия
c2e2ca5d49
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

+ 3 - 1
fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -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);