From 0f86f1d437cf905663175d308a735ec7b4216a82 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 5 Aug 2022 14:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/VisitListFormDTO.java | 2 ++
 .../service/impl/IcResiCollectVisitorServiceImpl.java      | 7 +++++++
 .../src/main/resources/mapper/IcResiCollectVisitorDao.xml  | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java
index 22d3ea67d6..09ca9bf294 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java
@@ -21,4 +21,6 @@ public class VisitListFormDTO extends PageFormDTO {
 
     private String customerId;
 
+    private String orgId;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
index 802af0d4d8..ccb7451952 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
@@ -78,6 +78,13 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
     @Override
     public PageData<IcResiCollectVisitorDTO> getVisitorList(VisitListFormDTO formDTO) {
         PageData<IcResiCollectVisitorDTO> result = new PageData<>(new ArrayList<>(), 0);
+        if (StringUtils.isBlank(formDTO.getStartTime()) && StringUtils.isBlank(formDTO.getEndTime()) ){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("查询人员信息失败"+formDTO.getUserId());
+            }
+            formDTO.setOrgId(staffInfo.getAgencyId());
+        }
         PageInfo<IcResiCollectVisitorDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
         result.setList(pageList.getList());
         result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
index 9b7aac1457..a5368d9781 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
@@ -99,6 +99,9 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test='orgId != null and orgId != "" '>
+            AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
+        </if>
         order by CREATED_TIME desc
     </select>