From 383ada505feeb0d806ed0ae419b9ae2cade7f7ed Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Mon, 22 Apr 2024 09:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dal/mysql/worklog/LogInstanceMapper.java |  6 +++++-
 .../service/worklog/LogInstanceServiceImpl.java     | 13 ++++++++++---
 .../resources/mapper/worklog/LogInstanceMapper.xml  | 10 ++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
index 029b1062..bd1fc990 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
@@ -55,5 +55,9 @@ public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
      * @param type
      * @return
      */
-    LogInstanceRespVO getNextOrUp(@Param("reqVO") LogInstancePageReqVO dto, @Param("id") Long id, @Param("userId") Long userId, @Param("type") Integer type, @Param("pagingType") Integer pagingType);
+    LogInstanceRespVO getNextOrUp(@Param("reqVO") LogInstancePageReqVO dto,
+                                  @Param("id") Long id, @Param("userId") Long userId,
+                                  @Param("type") Integer type,
+                                  @Param("pagingType") Integer pagingType,
+                                  @Param("userIds") List<Long> userIds);
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
index cee9684e..8eb3f51f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
@@ -234,7 +234,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
         List<Long> leaderUserIds = new ArrayList<>();
 
         //判断特殊情况， 只需查看各部门领导人得日志
-        if (pageReqVO.getIsBoss()!= null && pageReqVO.getIsBoss() == 1) {
+        if (pageReqVO.getIsBoss() != null && pageReqVO.getIsBoss() == 1) {
 
             //查询两级以及三级部门得领导人
             //以及岗位为总监或副总监的用户
@@ -368,8 +368,15 @@ public class LogInstanceServiceImpl implements LogInstanceService {
     @Override
     public LogInstanceNextOrUpVO getNextOrUp(LogInstancePageReqVO dto, Long id, Integer pagingType) {
         LogInstanceNextOrUpVO vo = new LogInstanceNextOrUpVO();
-        LogInstanceRespVO upLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, pagingType);
-        LogInstanceRespVO nextLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, pagingType);
+        List<Long> leaderUserIds = new ArrayList<>();
+        //判断特殊情况， 只需查看各部门领导人得日志
+        if (dto.getIsBoss() != null && dto.getIsBoss() == 1) {
+            //查询两级以及三级部门得领导人
+            //以及岗位为总监或副总监的用户
+            leaderUserIds = adminUserService.getUserByBoss();
+        }
+        LogInstanceRespVO upLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, pagingType, leaderUserIds);
+        LogInstanceRespVO nextLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, pagingType, leaderUserIds);
         vo.setUpLogInstance(upLogInstance);
         vo.setNextLogInstance(nextLogInstance);
         //获取日志详情
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
index fd1a054f..61d6013c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
@@ -168,8 +168,8 @@
                     and a.create_time &lt;= #{reqVO.createTime[1]}
                 </if>
             </if>
-            <if test="reqVO.unRead != null">
-                and e.read_status = 0
+            <if test="reqVO.readStatus != null">
+                and e.read_status = #{reqVO.readStatus}
             </if>
             <if test="pagingType == 0">
                 and a.start_user_id != #{userId}
@@ -177,6 +177,12 @@
             <if test="pagingType == 1">
                 and a.start_user_id = #{userId}
             </if>
+            <if test="reqVO.isBoss != null">
+                and a.start_user_id in
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
         </where>
         <if test="type == 0">
             order by id desc