From 90ec5e071ecaf9b7079b0693d1003b1416b432eb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 30 Jul 2025 13:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0taskId=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9D=A1=E4=BB=B6=E8=A7=A3=E5=86=B3=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/oa/controller/SysOaTaskController.java | 4 ++-- .../java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java index 518b4d5..ed157d8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java @@ -46,7 +46,7 @@ public class SysOaTaskController extends BaseController { return iSysOaTaskService.queryPageList(bo, pageQuery); } /** - * 查询任务管理列表 + * 查询我创建的任务管理列表 */ @GetMapping("/list-own-create") public TableDataInfo listOwnCreate(SysOaTaskBo bo, PageQuery pageQuery) { @@ -55,7 +55,7 @@ public class SysOaTaskController extends BaseController { } /** - * 查询任务管理列表 + * 查询分配给我的任务管理列表 */ @GetMapping("/list-own-work") public TableDataInfo listOwnWork(SysOaTaskBo bo, PageQuery pageQuery) { diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java index 801d96f..7f9d376 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java @@ -60,6 +60,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { QueryWrapper lqw = buildQueryWrapper(bo); lqw.orderByDesc("sot.task_rank"); lqw.orderByDesc("sot.create_time"); + lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性 Page result = baseMapper.selectListVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -69,6 +70,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { QueryWrapper lqw = buildQueryWrapper(bo); lqw.orderByDesc("sot.own_rank"); lqw.orderByDesc("sot.create_time"); + lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性 Page result = baseMapper.selectListVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -96,6 +98,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { .or() .isNotNull("soti.files"); lqw.orderByDesc("sot.create_time"); + lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性 Page result = baseMapper.queryPageListDocument(pageQuery.build(), lqw); return TableDataInfo.build(result); }