不需要登录用户信息

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);
     }
 

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>
+        <if test="agencyId != null and agencyId != ''">
             AND (
             n.AGENCY_ID = #{agencyId}
             OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+        </if>
     </select>
 
 </mapper>