From 7a041e64f14041b67590552ce328fed2f80fb6a2 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 20 Sep 2024 21:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E6=8E=92=E5=BA=8F=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/worklog/LogInstanceMapper.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 d659d7c4..dd42948b 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 @@ -57,9 +57,6 @@ public interface LogInstanceMapper extends BaseMapperX { queryWrapper.selectAs("COALESCE(c.readCount, 0)", LogInstanceRespVO::getReadCount); queryWrapper.selectAs("COALESCE(d.unreadCount, 0)", LogInstanceRespVO::getUnreadCount); queryWrapper.selectAs("COALESCE(b.comment, 0)", LogInstanceRespVO::getComment); - queryWrapper.innerJoin(UserPostDO.class, "userPost", UserPostDO::getUserId, LogInstanceDO::getStartUserId); - queryWrapper.innerJoin(DeptDO.class, "dept", DeptDO::getId, LogInstanceDO::getDeptId); - queryWrapper.innerJoin(PostDO.class, "post", PostDO::getId, UserPostDO::getPostId); queryWrapper.leftJoin(LogReadDo.class, "e", on -> on .eq(LogReadDo::getLogInstanceId, LogInstanceDO::getId) .eq(LogReadDo::getReadUserId, userId) @@ -67,6 +64,7 @@ public interface LogInstanceMapper extends BaseMapperX { queryWrapper.leftJoin("(SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 GROUP BY log_instance_id) c on t.id = c.log_instance_id"); queryWrapper.leftJoin("(SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 GROUP BY log_instance_id) AS d ON t.id = d.log_instance_id"); queryWrapper.leftJoin("(SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment GROUP BY work_log_id) AS b ON t.id = b.work_log_id"); +// queryWrapper.eq(pagingType == 1, LogInstanceDO::getStartUserId, userId); queryWrapper.eqIfPresent(LogInstanceDO::getDeptId, reqVO.getDeptId()); queryWrapper.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId()); queryWrapper.eqIfPresent(LogInstanceDO::getStartUserId, reqVO.getStartUserId()); @@ -82,15 +80,15 @@ public interface LogInstanceMapper extends BaseMapperX { if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 2) { queryWrapper.notLike(DeptDO::getFlag, "166"); } - if (pagingType == 0) { - queryWrapper.ne(LogInstanceDO::getStartUserId, userId); - } - if (pagingType == 1) { - queryWrapper.eq(LogInstanceDO::getStartUserId, userId); - } queryWrapper.groupBy(LogInstanceDO::getId); queryWrapper.orderByDesc(LogInstanceDO::getTime); - queryWrapper.orderByAsc(PostDO::getSort); + if (pagingType == 0) { + queryWrapper.innerJoin(UserPostDO.class, "userPost", UserPostDO::getUserId, LogInstanceDO::getStartUserId); + queryWrapper.innerJoin(DeptDO.class, "dept", DeptDO::getId, LogInstanceDO::getDeptId); + queryWrapper.innerJoin(PostDO.class, "post", PostDO::getId, UserPostDO::getPostId); + queryWrapper.ne(LogInstanceDO::getStartUserId, userId); + queryWrapper.orderByAsc(PostDO::getSort); + } queryWrapper.orderByDesc(LogInstanceDO::getCreateTime); return selectJoinPage(page, LogInstanceRespVO.class, queryWrapper);