From af11feb2a6caba6692d988f181a0c75f0e067f84 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Fri, 8 Jul 2022 14:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=EF=BC=9A1.=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E5=80=99=E6=8B=BC=E6=8E=A5=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9B=AE=E6=A0=87ID=5FPATH=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E3=80=822.=E6=9C=8D=E5=8A=A1=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=A0=E4=B8=8A=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcServiceRecordDao.java       | 3 ++-
 .../com/epmet/service/impl/IcServiceRecordServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/IcServiceRecordDao.xml          | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java
index 5a51a14a76..186a80a260 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java
@@ -25,5 +25,6 @@ public interface IcServiceRecordDao extends BaseDao<IcServiceRecordEntity> {
             @Param("serviceTimeStart") Date serviceTimeStart,
             @Param("serviceTimeEnd") Date serviceTimeEnd,
             @Param("serviceStatus") String serviceStatus,
-            @Param("satisfaction") String satisfaction);
+            @Param("satisfaction") String satisfaction,
+            @Param("searchOrgIdPath") String searchOrgIdPath);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
index 214b762cfc..77863907e6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java
@@ -260,7 +260,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
             if ("0".equals(agencyInfo.getPid())) {
                 return new String[]{ agencyInfo.getId(), agencyInfo.getOrganizationName() };
             }
-            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getPid()), agencyInfo.getOrganizationName() };
+            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getId()), agencyInfo.getOrganizationName() };
         } else if ("grid".equals(scopeObjectType)) {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(scopeObjectId);
             // 网格的pids是到社区的
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
index ad5df068ef..2c3093c02d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
@@ -36,6 +36,7 @@
                record.SERVICE_STATUS,
                record.SERVICE_PEOPLE_NUMBER
         from ic_service_record record
+                inner join ic_service_scope scope on (scope.DEL_FLAG = '0' and record.ID = scope.SERVICE_RECORD_ID)
                  left join ic_service_feedback feedback on (record.ID = feedback.SERVICE_RECORD_ID)
         <where>
             record.DEL_FLAG = '0'
@@ -61,6 +62,9 @@
             <if test="satisfaction != null and satisfaction != ''">
                 and feedback.SATISFACTION = #{satisfaction}
             </if>
+            <if test="searchOrgIdPath != null and searchOrgIdPath != ''">
+                and scope.OBJECT_ID_PATH like CONCAT(#{searchOrgIdPath}, '%')
+            </if>
         </where>
         order by record.CREATED_TIME desc
     </select>