From 4cb19d1f4071f89ac33c7d999060ccec62e415ae Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Jun 2022 18:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=20=E5=8E=BB=E9=99=A4=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index f2fa4196a4..b021e636df 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -775,7 +775,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 staffOrgPath = staffInfoCacheResult.getAgencyId();
             }
         } else {
-            formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()));
+            formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()) && CollectionUtils.isNotEmpty(o.getColumnValue()));
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO));
             if (agencyInfo == null){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败");