From 9447f08b10a3189540d0a69c31a2a00b230b0bfe Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 10:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcWorkLogServiceImpl.java   |  2 ++
 .../src/main/resources/mapper/IcWorkLogDao.xml         | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
index d010231a2b..e4881ebf1e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
@@ -68,6 +68,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     public PageData<IcWorkLogDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        params.put("createdBy", loginUserUtil.getLoginUserId());
         IPage<IcWorkLogDTO> page = getPage(params);
         List<IcWorkLogDTO> list = baseDao.listPage(params);
         return new PageData<>(list, page.getTotal());
@@ -83,6 +84,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     public List<IcWorkLogDTO> list4Export(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        params.put("createdBy", loginUserUtil.getLoginUserId());
         List<IcWorkLogDTO> list = baseDao.list4Export(params);
         Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode());
         if (!result.success() || null == result.getData()) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml
index 063f8b1969..50120b91b5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml
@@ -42,11 +42,14 @@
             AND wl.GRID_ID = #{gridId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND wl.AGENCY_ID = #{agencyId}
+            AND FIND_IN_SET( #{agencyId}, wl.pids )
         </if>
         <if test="mobile != null and mobile != '' ">
             AND wl.MOBILE = #{mobile}
         </if>
+        <if test="isSelf != null and isSelf != '' and isSelf == '1' ">
+            AND wl.CREATED_BY = #{createdBy}
+        </if>
         <if test="startTime != null and startTime != '' ">
             AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime}
         </if>
@@ -85,11 +88,14 @@
             AND wl.GRID_ID = #{gridId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND wl.AGENCY_ID = #{agencyId}
+            AND FIND_IN_SET( #{agencyId}, wl.pids )
         </if>
         <if test="mobile != null and mobile != '' ">
             AND wl.MOBILE = #{mobile}
         </if>
+        <if test="isSelf != null and isSelf != '' and isSelf == '1' ">
+            AND wl.CREATED_BY = #{createdBy}
+        </if>
         <if test="startTime != null and startTime != '' ">
             AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime}
         </if>