浏览代码

场景关联列表 styles为空时返回空数组

dengsixing 3 年之前
父节点
当前提交
1249b59cd0

+ 7 - 4
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1999,10 +1999,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         //排序
-        List<JSONObject> styleList = styleBeans.stream().sorted(Comparator.comparing(StyleBean::getCreateTime).reversed())
-            .map(item -> {
-                return item.getStyle();
-            }).collect(Collectors.toList());
+        List<JSONObject> styleList = Lists.newArrayList();
+        if(CollUtil.isNotEmpty(styleBeans)){
+            styleList = styleBeans.stream().sorted(Comparator.comparing(StyleBean::getCreateTime).reversed())
+                .map(item -> {
+                    return item.getStyle();
+                }).collect(Collectors.toList());
+        }
 
         return styleList;
     }