Merge branch 'mazq-bug-fix-0812' into 'release/v2.2.2'

feature(数据标签展示修改): 数据标签展示修改

See merge request dcuc-tjdsj/app-service!62

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -130,8 +130,11 @@ public class DataResourceFacade implements IDataResourceFacade
               .pId(dataLevelTreeVo.getId())
               .innerId(item.getInnerId()).build()).collect(Collectors.toList());
         dataLevelTreeVo.setChild(child);
-
-        dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(dataLevelTreeVo);}});
+        if(child.size() == 0) {
+            dataResourceClassifyVo.setNodes(new ArrayList<>());
+        } else {
+            dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(dataLevelTreeVo);}});
+        }
         //设置总数量
         dataResourceClassifyVo.setTotal(child.size());
         return dataResourceClassifyVo;
@@ -164,9 +167,14 @@ public class DataResourceFacade implements IDataResourceFacade
                 .pId(securityLevelTree.getId())
                 .innerId(item.getInnerId()).build()).collect(Collectors.toList());
         securityLevelTree.setChild(child);
-        dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(securityLevelTree);}} );
-        //设置总数量
-        dataResourceClassifyVo.setTotal(child.size());
+        if(child.size() == 0) {
+            dataResourceClassifyVo.setNodes(new ArrayList<>());
+            dataResourceClassifyVo.setTotal(0);
+        } else {
+            dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(securityLevelTree);}} );
+            //设置总数量
+            dataResourceClassifyVo.setTotal(child.size());
+        }
         return dataResourceClassifyVo;
     }
 
@@ -197,10 +205,14 @@ public class DataResourceFacade implements IDataResourceFacade
         combineTreeNode(secNodes, thirdNodes);
         combineTreeNode(thirdNodes, fourNodes);
         topTreeVo.setChild(firNodes);
-
-        //计算总数量
-        resourceVo.setTotal(getTotalCount(topTreeVo));
-        resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
+        if(firNodes.size() == 0) {
+            resourceVo.setNodes(new ArrayList<>());
+            resourceVo.setTotal(0);
+        } else {
+            //计算总数量
+            resourceVo.setTotal(getTotalCount(topTreeVo));
+            resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
+        }
         return resourceVo;
     }
 
@@ -232,8 +244,13 @@ public class DataResourceFacade implements IDataResourceFacade
                 .stream().map(item -> convertFieldClaToNode(item, item.getFirId())).collect(Collectors.toList());
         combineTreeNode(firNodes, secNodes);
         topTreeVo.setChild(firNodes);
-        resourceVo.setTotal(getTotalCount(topTreeVo));
-        resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
+        if(firNodes.size() == 0) {
+            resourceVo.setNodes(new ArrayList<>());
+            resourceVo.setTotal(0);
+        } else {
+            resourceVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(topTreeVo);}});
+            resourceVo.setTotal(getTotalCount(topTreeVo));
+        }
         return resourceVo;
     }