运营月报 优化

@@ -83,7 +83,7 @@ public class OperationReportController {
         List<Map<String, Object>> resMapList = new ArrayList<>();
         List<Map<String, Object>> resMapList = new ArrayList<>();
         for (String  tmpDepartId : departIdArray) {
         for (String  tmpDepartId : departIdArray) {
             String childDepartId = departService.getChildDepartId(tmpDepartId);
             String childDepartId = departService.getChildDepartId(tmpDepartId);
-            SysDepart tmpSysDepart = departService.getById(departId);
+            SysDepart tmpSysDepart = departService.getById(tmpDepartId);
             // 获取机构子集
             // 获取机构子集
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("startTime", startTime);
             paramMap.put("startTime", startTime);
@@ -92,7 +92,7 @@ public class OperationReportController {
             Map<String, Object> resMap = operationReportService.dataAnalysisOfMonth(paramMap);
             Map<String, Object> resMap = operationReportService.dataAnalysisOfMonth(paramMap);
             resMap.put("departId", tmpDepartId);
             resMap.put("departId", tmpDepartId);
             resMap.put("departName", sysDepartDictMap.get(tmpDepartId));
             resMap.put("departName", sysDepartDictMap.get(tmpDepartId));
-            resMap.put("departType", tmpSysDepart.getDepartType());
+            resMap.put("departType", tmpSysDepart != null ? tmpSysDepart.getDepartType() : "");
             resMapList.add(resMap);
             resMapList.add(resMap);
         }
         }
         return Result.ok(resMapList);
         return Result.ok(resMapList);

@@ -165,4 +165,6 @@ public class ReportTargetConfig {
 	private Integer delFlag;
 	private Integer delFlag;
 
 
 	private String targetPowerCost;
 	private String targetPowerCost;
+
+	private String targetWaterCostIn;
 }
 }