From 7d21bf38ec0baa37f27cf0afe0a5c45a41b1da6e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Apr 2023 17:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E7=BB=84=E7=BB=87=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerDepartmentServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
index 061cbccd04..9a95149a5f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
+++ b/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(),"部门名称已存在","部门名称已存在");
         }