From ca1dce3df40d535a7b4176160bf36917dc603bb1 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Fri, 8 Jul 2022 14:41:17 +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

---
 .../impl/IcServiceRecordServiceImpl.java      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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 77863907e6..cb88587cdf 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
@@ -2,15 +2,18 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
 import com.epmet.dto.IcNeighborHoodDTO;
@@ -147,8 +150,22 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
         }
 
+
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),
+                EpmetRequestHolder.getLoginUserId());
+
+//       当前组织的PIDS。只查询当前组织及下级的服务记录
+        String searchOrgIdPath = "";
+
+        if (StringUtils.isBlank(staffInfo.getAgencyPIds()) || "0".equals(staffInfo.getAgencyPIds())) {
+            searchOrgIdPath = staffInfo.getAgencyId();
+        } else {
+            searchOrgIdPath = staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId());
+        }
         PageHelper.startPage(pageNo, pageSize);
-        List<ServiceProjectRecordResultDTO> records = baseDao.listServiceRecords(serviceCategoryKey, serviceProjectName, serviceOrgName, serviceTimeStart, serviceTimeEnd, serviceStatus, satisfaction);
+        List<ServiceProjectRecordResultDTO> records = baseDao.listServiceRecords(
+                serviceCategoryKey, serviceProjectName, serviceOrgName, serviceTimeStart, serviceTimeEnd, serviceStatus, satisfaction, searchOrgIdPath);
+
         PageInfo<ServiceProjectRecordResultDTO> pi = new PageInfo<>(records);
 
         // 补充信息