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 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 @@ and a.start_user_id = #{userId} - + and a.start_user_id in #{userId} --- 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