通讯录部门列表增加返参，部门加人、删除操作增加判断

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;
+
 }

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;
+
 }

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 = "";
+
 }

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;
+
 }

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;
+
 }

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());

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 @@
     <!-- 根据部门id查询customerId -->
     <select id="selectCustomerIdByDepartmentId" resultType="com.epmet.dto.CustomerIdDTO">
         SELECT
-	        customer_id AS customerId
+	        customer_id AS customerId,
+	        dept_type AS deptType
         FROM
             customer_department
         WHERE