From f65444fa973d99565e4302fd6767ed8165a1050f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 8 May 2023 15:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java  | 3 ++-
 .../epmet/service/impl/PropertyManagementServiceImpl.java   | 6 +++---
 .../src/main/resources/mapper/IcNeighborHoodPropertyDao.xml | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java
index 8461ea9156..55b50486de 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java
@@ -36,7 +36,8 @@ public interface IcNeighborHoodPropertyDao extends BaseDao<IcNeighborHoodPropert
     /**
      * 查询物业下的小区名称
      * @param propertyId 物业id
-     * @return
+     * @param agencyId 组织id
+     * @return 当前物业在 当前组织及下级范围内，管理的小区数量
      */
     List<IcNeighborHoodDTO> getNeighborHoodList(@Param("propertyId") String propertyId, @Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
index 429ec85004..3c0f26de7f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
@@ -184,13 +184,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
      */
     @Override
     public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name, String contactName, String contactMobile) {
-        CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId());
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
         PageHelper.startPage(pageNo, pageSize);
-        List<IcPropertyManagementDTO> list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile,staffInfoCacheResult.getAgencyId());
+        List<IcPropertyManagementDTO> list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile, staffInfoCacheResult.getAgencyId());
         PageInfo<IcPropertyManagementDTO> pageInfo = new PageInfo<>(list);
         // 导出时需要导出关联的小区名称
         pageInfo.getList().forEach(result -> {
-            List<IcNeighborHoodDTO> neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId(),staffInfoCacheResult.getAgencyId());
+            List<IcNeighborHoodDTO> neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId(), staffInfoCacheResult.getAgencyId());
             List<String> neighborHoodNames = neighborHoodList.stream()
                     .map(IcNeighborHoodDTO::getNeighborHoodName)
                     .distinct().collect(Collectors.toList());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml
index e7f8e0d2dd..4ea353272f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml
@@ -15,6 +15,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--    当前物业在 当前组织及下级范围内，管理的小区数量 -->
     <select id="getNeighborHoodList" parameterType="java.lang.String" resultType="com.epmet.dto.IcNeighborHoodDTO">
         SELECT
             p.NEIGHBOR_HOOD_ID,
@@ -24,7 +25,7 @@
         INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID )
         WHERE
             p.PROPERTY_ID = #{propertyId}
-          AND (h.AGENCY_ID =#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
+          AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
           AND p.DEL_FLAG = '0'
           AND h.DEL_FLAG = '0'
         order by h.CREATED_TIME asc