diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java index 01f072752a..bd8d994b8a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddAgencyResultDTO.java +++ b/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 = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddDepartmentResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddDepartmentResultDTO.java index b6206d0c6d..bc450263e5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AddDepartmentResultDTO.java +++ b/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 = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java index 9673700fcc..b1261e2761 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java +++ b/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 = ""; /** * 总人数 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index 5cf2649ac5..4b819ec2b5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/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 = ""; /** * 本机关的所有上级机关 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartInStaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartInStaffListResultDTO.java index e63020a209..106fcfcd4c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartInStaffListResultDTO.java +++ b/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 = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java index c4b87cc743..8d7ab9dff2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java +++ b/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 = ""; /** * 部门下工作人员列表 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java index 7fafa0238d..3d7a87ec9d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java +++ b/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 = ""; /** * 部门下总人数 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java index 73608b1943..60683bf779 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java +++ b/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 = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java index 57ab12c3df..17dc985695 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubListResultDTO.java +++ b/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 = ""; } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 8af4a38647..37d59a6225 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/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> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO) { + public Result> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO fromDTO) { return customerStaffService.getDepartmentStaffList(fromDTO); }