Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

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

@@ -126,7 +126,7 @@ public class CustomerDepartmentServiceImpl extends BaseServiceImpl<CustomerDepar
         LambdaQueryWrapper<CustomerDepartmentEntity> countQuery=new LambdaQueryWrapper<>();
         countQuery.eq(CustomerDepartmentEntity::getAgencyId,agencyId)
                 .eq(CustomerDepartmentEntity::getDepartmentName,departmentName)
-                .ne(CustomerDepartmentEntity::getId,deptId);
+                .ne(StringUtils.isNotBlank(deptId),CustomerDepartmentEntity::getId,deptId);
         if(baseDao.selectCount(countQuery)>0){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"部门名称已存在","部门名称已存在");
         }