lyhzzz před 1 rokem
rodič
revize
155c6d90ef

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/TmDepartment.java

@@ -115,4 +115,7 @@ public class TmDepartment implements Serializable {
      */
     @TableField(exist = false)
     private List<TmDepartment> children;
+
+    @TableField(exist = false)
+    private Boolean noStatisticsSon = false;
 }

+ 4 - 0
src/main/java/com/fdkankan/fusion/service/impl/DataService.java

@@ -67,6 +67,9 @@ public class DataService implements IDataService {
                 for (Long cameraId : cameraIdList) {
                     count += cameraIdMap.get(cameraId) == null ? 0 : cameraIdMap.get(cameraId);
                 }
+                if(department.getNoStatisticsSon()){
+                    return count;
+                }
                 if(department.getChildren() != null && department.getChildren().size() >0){
                     count += addCountByDept(department.getChildren(), deptIdMap, cameraIdMap);
                 }
@@ -118,6 +121,7 @@ public class DataService implements IDataService {
         }
         if(department1.getChildren()!= null && department1.getChildren().size() >0){  //总队
             List<TmDepartment> departments = new ArrayList<>();
+            department1.setNoStatisticsSon(true);
             departments.add(department1);
             departments.addAll(department1.getChildren());
             return departments;