lyhzzz преди 2 години
родител
ревизия
3fb0fc14d8

+ 6 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -363,10 +363,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             SceneVo sceneVo = new SceneVo();
             SceneVo sceneVo = new SceneVo();
             sceneVo.setIsFolder(1);
             sceneVo.setIsFolder(1);
             sceneVo.setName("双目文件夹");
             sceneVo.setName("双目文件夹");
-            sceneVo.setType("3");
+            sceneVo.setType(3);
             Integer count = sceneService.getCountByUserId(user.getId());
             Integer count = sceneService.getCountByUserId(user.getId());
-            sceneVo.setSceneNum(Long.valueOf(count));
-            folderList.add(sceneVo);
+            if(count >0){
+                sceneVo.setSceneNum(Long.valueOf(count));
+                folderList.add(sceneVo);
+            }
+
         }
         }
 
 
         List<SceneVo> sceneList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 0).collect(Collectors.toList());
         List<SceneVo> sceneList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 0).collect(Collectors.toList());

+ 1 - 1
src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -34,7 +34,7 @@ public class SceneVo {
     private String name;
     private String name;
     private Long parentId;
     private Long parentId;
     private Long sceneNum;
     private Long sceneNum;
-    private String type;
+    private Integer type;
 
 
     public String getCreateTime() {
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);
         return DateUserUtil.getDayTime(createTime);