From c4b52791676fab5eec9f86151593eaa9e7e6303d Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Tue, 10 Sep 2024 23:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/worklog/LogInstanceServiceImpl.java     | 2 +-
 .../main/resources/mapper/worklog/LogInstanceMapper.xml    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 836a5159..8a65af86 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
@@ -237,7 +237,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
         List<Long> leaderUserIds = new ArrayList<>();
 
         //判断特殊情况， 只需查看各部门领导人得日志
-        if (pageReqVO.getIsBoss() != null && pageReqVO.getIsBoss() == 1) {
+        if (pageReqVO.getIsProduce() == null && pageReqVO.getIsBoss() != null && pageReqVO.getIsBoss() == 1) {
 
             //查询两级以及三级部门得领导人
             //以及岗位为总监或副总监的用户
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 8382726e..469451ab 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
@@ -147,17 +147,18 @@
             <if test="pagingType == 1">
                 and a.start_user_id = #{userId}
             </if>
-            <if test="reqVO.isBoss != null">
+            <if test="reqVO.isBoss != null and reqVO.isProduce == null">
                 and a.start_user_id in
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}
                 </foreach>
             </if>
         </where>
---         GROUP BY a.id, readStatus, readCount, unReadCount, comment
+        GROUP BY a.id
         ORDER BY
             a.time DESC,
-            post.sort
+            post.sort,
+            a.start_user_id
     </select>
     <select id="getNextOrUp"
             resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">