解决代码被人覆盖问题以及所有接口返参不允许出现null问题

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java

@@ -35,6 +35,6 @@ public class AddAgencyResultDTO implements Serializable {
     /**
      * 机关组织Id
      */
-    private String agencyId;
+    private String agencyId = "";
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddDepartmentResultDTO.java

@@ -35,6 +35,6 @@ public class AddDepartmentResultDTO implements Serializable {
     /**
      * 新增部门Id
      */
-    private String departmentId;
+    private String departmentId = "";
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java

@@ -35,12 +35,12 @@ public class AgencyListResultDTO implements Serializable {
     /**
      * 机关组织Id
      */
-    private String agencyId;
+    private String agencyId = "";
 
     /**
      * 机关组织名称
      */
-    private String agencyName;
+    private String agencyName = "";
 
     /**
      * 总人数

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@@ -36,12 +36,12 @@ public class AgencysResultDTO implements Serializable {
     /**
      * 机关组织Id
      */
-    private String agencyId;
+    private String agencyId = "";
 
     /**
      * 组织名称
      */
-    private String agencyName;
+    private String agencyName = "";
 
     /**
      * 机关级别（社区级：community，
@@ -50,27 +50,27 @@ public class AgencysResultDTO implements Serializable {
      * 市级: city
      * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
      */
-    private String level;
+    private String level = "";
 
     /**
      * 地区编码
      */
-    private String areaCode;
+    private String areaCode = "";
 
     /**
      * 省份
      */
-    private String province;
+    private String province = "";
 
     /**
      * 城市
      */
-    private String city;
+    private String city = "";
 
     /**
      * 区县
      */
-    private String district;
+    private String district = "";
 
     /**
      * 本机关的所有上级机关

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartInStaffListResultDTO.java

@@ -35,17 +35,17 @@ public class DepartInStaffListResultDTO implements Serializable {
     /**
      * 用户ID
      */
-    private String staffId;
+    private String staffId = "";
 
     /**
      * 用户姓名
      */
-    private String staffName;
+    private String staffName = "";
 
     /**
      * 用户头像
      */
-    private String staffHeadPhoto;
+    private String staffHeadPhoto = "";
 
     /**
      * 性别
@@ -55,6 +55,6 @@ public class DepartInStaffListResultDTO implements Serializable {
     /**
      * 角色名称
      */
-    private String roleName;
+    private String roleName = "";
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java

@@ -36,22 +36,22 @@ public class DepartmentDetailResultDTO implements Serializable {
     /**
      * 组织机构Id
      */
-    private String agencyId;
+    private String agencyId = "";
 
     /**
      * 部门Id
      */
-    private String departmentId;
+    private String departmentId = "";
 
     /**
      * 部门名称
      */
-    private String departmentName;
+    private String departmentName = "";
 
     /**
      * 部门职责
      */
-    private String departmentDuty;
+    private String departmentDuty = "";
 
     /**
      * 部门下工作人员列表

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java

@@ -35,12 +35,12 @@ public class DepartmentListResultDTO implements Serializable {
     /**
      * 部门Id
      */
-    private String departmentId;
+    private String departmentId = "";
 
     /**
      * 部门名称
      */
-    private String departmentName;
+    private String departmentName = "";
 
     /**
      * 部门下总人数

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java

@@ -36,11 +36,11 @@ public class ParentListResultDTO implements Serializable {
     /**
      * 机关组织Id
      */
-    private String id;
+    private String id = "";
     /**
      * 机关组织名称
      */
-    private String name;
+    private String name = "";
 
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java

@@ -35,11 +35,11 @@ public class SubListResultDTO implements Serializable {
     /**
      * 机关组织Id
      */
-    private String agencyId;
+    private String agencyId = "";
     /**
      * 机关组织名称
      */
-    private String agencyName;
+    private String agencyName = "";
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -263,7 +263,7 @@ public class CustomerStaffController {
      * @Description 根据客户Id及userId集合查询用户基本信息
      */
     @PostMapping("getdepartmentstafflist")
-    public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO) {
+    public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO fromDTO) {
         return customerStaffService.getDepartmentStaffList(fromDTO);
     }