|
@@ -93,7 +93,7 @@ public class DataService implements IDataService {
|
|
count += cameraIdMap.get(cameraId) == null ? 0 : cameraIdMap.get(cameraId);
|
|
count += cameraIdMap.get(cameraId) == null ? 0 : cameraIdMap.get(cameraId);
|
|
}
|
|
}
|
|
if(department.getChildren() != null && department.getChildren().size() >0){
|
|
if(department.getChildren() != null && department.getChildren().size() >0){
|
|
- return count + addCountByDept(department.getChildren(), deptIdMap, cameraIdMap);
|
|
|
|
|
|
+ count += addCountByDept(department.getChildren(), deptIdMap, cameraIdMap);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -104,7 +104,7 @@ public class DataService implements IDataService {
|
|
for (TmDepartment department : departments) {
|
|
for (TmDepartment department : departments) {
|
|
count += deptMap.get(department.getId()) == null? 0L :deptMap.get(department.getId());
|
|
count += deptMap.get(department.getId()) == null? 0L :deptMap.get(department.getId());
|
|
if(department.getChildren() != null && department.getChildren().size() >0){
|
|
if(department.getChildren() != null && department.getChildren().size() >0){
|
|
- return count + addCountByDept(department.getChildren(), deptMap);
|
|
|
|
|
|
+ count += addCountByDept(department.getChildren(), deptMap);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return count;
|
|
return count;
|