优化

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/CompartmentResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,17 +19,17 @@ public class CompartmentResultDTO implements Serializable {
     /**
      * 当前所选组织
      */
-    private String agencyId;
+    private String agencyId = "";
 
     /**
      * 当前所选组织名称
      */
-    private String name;
+    private String name = "";
 
     /**
      * 当前所选组织的坐标区域
      */
-    private String areaMarks;
+    private String areaMarks = "";
 
     /**
      * 机关级别
@@ -44,5 +45,5 @@ public class CompartmentResultDTO implements Serializable {
     /**
      * 子级用户分布
      */
-    private List<AgencyDistributionResultDTO> agencyDistribution;
+    private List<AgencyDistributionResultDTO> agencyDistribution = new ArrayList<>();
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ParymemberResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,5 +45,5 @@ public class ParymemberResultDTO implements Serializable {
     /**
      * 子级用户分布
      */
-    private List<ParymemberDistributionResultDTO> userDistribution;
+    private List<ParymemberDistributionResultDTO> userDistribution = new ArrayList<>();
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectDetailResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,5 +43,5 @@ public class ProjectDetailResultDTO implements Serializable {
     /**
      * 图片列表
      */
-    private List<String> imgList;
+    private List<String> imgList = new ArrayList<>();
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TreeResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,12 +19,12 @@ public class TreeResultDTO implements Serializable {
     /**
      * 显示名称
      */
-    private String label;
+    private String label = "";
 
     /**
      * agencyId下拉框value
      */
-    private String value;
+    private String value = "";
 
     @JsonIgnore
     private String pids;
@@ -31,6 +32,6 @@ public class TreeResultDTO implements Serializable {
     /**
      * 子目录
      */
-    private List<TreeResultDTO> children;
+    private List<TreeResultDTO> children = new ArrayList<>();
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/UserResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,17 +19,17 @@ public class UserResultDTO implements Serializable {
     /**
      * 当前所选组织
      */
-    private String agencyId;
+    private String agencyId = "";
 
     /**
      * 当前所选组织名称
      */
-    private String name;
+    private String name = "";
 
     /**
      * 当前所选组织的坐标区域
      */
-    private String areaMarks;
+    private String areaMarks = "";
 
     /**
      * 机关级别
@@ -44,5 +45,5 @@ public class UserResultDTO implements Serializable {
     /**
      * 子级用户分布
      */
-    private List<UserDistributionResultDTO> userDistribution;
+    private List<UserDistributionResultDTO> userDistribution = new ArrayList<>();
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java

@@ -75,7 +75,7 @@ public class AgencyServiceImpl implements AgencyService {
     public CompartmentResultDTO compartment(CompartmentFormDTO compartmentFormDTO) {
         CompartmentResultDTO agencyAreaInfo = screenCustomerAgencyDao.getAgencyAreaInfo(compartmentFormDTO.getAgencyId());
         if (null == agencyAreaInfo){
-            return agencyAreaInfo;
+            return new CompartmentResultDTO();
         }
         if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -60,7 +60,7 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
         MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId());
-        if (null == monthPieChartFormDTO){
+        if (null == monthPieChartResultDTO){
             return new MonthPieChartResultDTO();
         }
         return monthPieChartResultDTO;