1

src/main/java/com/fdkankan/fusion/service/impl/DataService.java

@@ -63,26 +63,21 @@ public class DataService implements IDataService {
         for (TmDepartment department : deptList) {
             List<Long> cameraIdList = deptIdMap.get(department.getId());
             Long count = 0L;
-            DataGroupVo vo = new DataGroupVo();
-            vo.setDataCount(count);
-            vo.setGroupKey(department.getName());
+
             if(cameraIdList != null){
                 for (Long cameraId : cameraIdList) {
                     count += cameraIdMap.get(cameraId) == null ? 0 : cameraIdMap.get(cameraId);
                 }
-                if(department.getNoStatisticsSon()){
-                    vo.setDataCount(count);
-                    dataGroupVos.add(vo);
-                    continue;
-                }
-                if(department.getChildren() != null && department.getChildren().size() >0){
+                if(!department.getNoStatisticsSon() && department.getChildren() != null && department.getChildren().size() >0){
                     count += addCountByDept(department.getChildren(), deptIdMap, cameraIdMap);
                 }
             }else {
-                if(department.getChildren() != null && department.getChildren().size() >0){
+                if(!department.getNoStatisticsSon() && department.getChildren() != null && department.getChildren().size() >0){
                     count += addCountByDept(department.getChildren(), deptIdMap, cameraIdMap);
                 }
             }
+            DataGroupVo vo = new DataGroupVo();
+            vo.setGroupKey(department.getName());
             vo.setDataCount(count);
             dataGroupVos.add(vo);
         }