程序调整

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java

@@ -71,6 +71,11 @@ public class AddDepartmentFormDTO implements Serializable {
      * 总人数
      */
     private Integer totalUser;
+    /**
+     * 联建单位:  party_unit
+     * 社会自组织:  community_org
+     */
+    private String deptType;
 
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -107,6 +107,9 @@ public class DepartmentServiceImpl implements DepartmentService {
         Result<AddDepartmentResultDTO> result = new Result<AddDepartmentResultDTO>();
         AddDepartmentResultDTO addDepartmentResultDTO = new AddDepartmentResultDTO();
         CustomerDepartmentEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerDepartmentEntity.class);
+        if (formDTO.getTotalUser() > NumConstant.ZERO) {
+            entity.setTotalUser(formDTO.getTotalUser());
+        }
         entity.setTotalUser(NumConstant.ZERO);
         //1:查询当前组织机构信息，获取客户Id
         CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
@@ -403,6 +406,7 @@ public class DepartmentServiceImpl implements DepartmentService {
             deptDTO.setAgencyId(staffInfo.getAgencyId());
             deptDTO.setDepartmentDuty("");
             deptDTO.setDepartmentName(formDTO.getDeptName());
+            deptDTO.setDeptType(formDTO.getDeptType());
             deptDTO.setTotalUser(1);
             Result<AddDepartmentResultDTO> deptResult = addDepartment(deptDTO);
             //三、新增组织人员关系数据