From 73e013629953e1129e8cd0c0cbd7d826477193c3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 16:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8A=A0=E4=BA=BA=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/CustomerDepartmentDTO.java | 7 +++++++ .../src/main/java/com/epmet/dto/CustomerIdDTO.java | 7 +++++++ .../com/epmet/dto/result/DepartmentDetailResultDTO.java | 7 +++++++ .../com/epmet/dto/result/DepartmentListResultDTO.java | 8 ++++++++ .../java/com/epmet/entity/CustomerDepartmentEntity.java | 8 ++++++++ .../com/epmet/service/impl/DepartmentServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/CustomerDepartmentDao.xml | 6 ++++-- 7 files changed, 49 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java index 9381a609d0..707ca8166f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java @@ -109,4 +109,11 @@ public class CustomerDepartmentDTO implements Serializable { */ private String mobile; + /** + * 职能部门: duty + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerIdDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerIdDTO.java index d18a182d1e..7c2175b9fa 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerIdDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerIdDTO.java @@ -24,4 +24,11 @@ public class CustomerIdDTO implements Serializable { */ private String customerId; + /** + * 职能部门: duty + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; + } 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 2cec409cf9..c04e965569 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 @@ -73,4 +73,11 @@ public class DepartmentDetailResultDTO implements Serializable { */ private String mobile = ""; + /** + * 职能部门: duty + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType = ""; + } \ No newline at end of file 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 9b2cf82cc3..cb9b1a0b3e 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 @@ -59,4 +59,12 @@ public class DepartmentListResultDTO implements Serializable { */ private String mobile = ""; private String areaCode; + + /** + * 职能部门: duty + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java index bfce4de96f..e6a3dbf55f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java @@ -79,4 +79,12 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + /** + * 职能部门: duty + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 22fcda5a1e..51ab136d05 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -154,6 +154,10 @@ public class DepartmentServiceImpl implements DepartmentService { Result result = new Result(); //1:判断当前部门下是否存在工作人员，不存在的可以删除 CustomerDepartmentEntity entity = customerDepartmentDao.selectById(formDTO.getDepartmentId()); + if (null != entity && ("party_unit".equals(entity.getDeptType()) || "community_org".equals(entity.getDeptType()))) { + String msg = String.format("当前部门为%s同步数据，不允许删除", ("party_unit".equals(entity.getDeptType()) ? "联建单位" : "社会自组织")); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } if (null != entity && entity.getTotalUser() > NumConstant.ZERO) { result.setCode(EpmetErrorCode.NOT_DEL_DEPARTMENT.getCode()); result.setMsg(EpmetErrorCode.NOT_DEL_DEPARTMENT.getMsg()); @@ -245,6 +249,10 @@ public class DepartmentServiceImpl implements DepartmentService { public Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) { CustomerIdDTO customerIdDTO = customerDepartmentDao.selectCustomerIdByDepartmentId(addDepartmentStaffFormDTO.getDepartmentId()); + if (null != customerIdDTO && ("party_unit".equals(customerIdDTO.getDeptType()) || "community_org".equals(customerIdDTO.getDeptType()))) { + String msg = String.format("当前部门为%s同步数据，不允许添加工作人员", ("party_unit".equals(customerIdDTO.getDeptType()) ? "联建单位" : "社会自组织")); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } for (String userId : addDepartmentStaffFormDTO.getSelectedList()) { CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity(); customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml index 3e1e4f50c2..ba49028cf1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml @@ -27,7 +27,8 @@ IFNULL(code,'')AS 'code', IFNULL(contacts,'')AS 'contacts', IFNULL(mobile,'')AS 'mobile', - IFNULL(AREA_CODE,'')AS areaCode + IFNULL(AREA_CODE,'')AS areaCode, + IFNULL(DEPT_TYPE,'')AS deptType FROM customer_department WHERE del_flag = '0' AND agency_id = #{agencyId} @@ -46,7 +47,8 @@