From 120c6670b8ee3d07b1657c8120b89b8c0f2d34de Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 30 Aug 2022 11:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcNeighborHoodServiceImpl.java        | 18 +++++++++---------
 .../main/resources/mapper/IcBuildingDao.xml    |  8 +++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 71f15a0fe4..66658f83f2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -214,15 +214,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
     public List<BuildingResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
         dto.setCustomerId(tokenDto.getCustomerId());
-        if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
-            log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
-            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-            if (null == result || StringUtils.isBlank(result.getAgencyId())) {
-                log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId()));
-                return Collections.emptyList();
-            }
-            dto.setAgencyId(result.getAgencyId());
-        }
+//        if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
+//            log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
+//            CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+//            if (null == result || StringUtils.isBlank(result.getAgencyId())) {
+//                log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId()));
+//                return Collections.emptyList();
+//            }
+//            dto.setAgencyId(result.getAgencyId());
+//        }
         return icBuildingDao.listBuildingInfo(dto);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 0b71b79176..a5e3001d28 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -478,9 +478,11 @@
         <if test="buildingName != null and buildingName != ''">
             AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%'))
         </if>
-        AND (
-        n.AGENCY_ID = #{agencyId}
-        OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+        <if test="agencyId != null and agencyId != ''">
+            AND (
+            n.AGENCY_ID = #{agencyId}
+            OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+        </if>
     </select>
 
 </mapper>