DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加taskId作为排序条件解决任务重复问题

Browse Source
This commit is contained in:
Joshi
2025-07-30 13:30:50 +08:00
parent 73242428cb
commit 90ec5e071e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java
View File

@@ -46,7 +46,7 @@ public class SysOaTaskController extends BaseController {
return iSysOaTaskService.queryPageList(bo, pageQuery); return iSysOaTaskService.queryPageList(bo, pageQuery);
} }
/** /**
* 查询任务管理列表 * 查询我创建的任务管理列表
*/ */
@GetMapping("/list-own-create") @GetMapping("/list-own-create")
public TableDataInfo<SysOaTaskVo> listOwnCreate(SysOaTaskBo bo, PageQuery pageQuery) { public TableDataInfo<SysOaTaskVo> listOwnCreate(SysOaTaskBo bo, PageQuery pageQuery) {
@@ -55,7 +55,7 @@ public class SysOaTaskController extends BaseController {
} }
/** /**
* 查询任务管理列表 * 查询分配给我的任务管理列表
*/ */
@GetMapping("/list-own-work") @GetMapping("/list-own-work")
public TableDataInfo<SysOaTaskVo> listOwnWork(SysOaTaskBo bo, PageQuery pageQuery) { public TableDataInfo<SysOaTaskVo> listOwnWork(SysOaTaskBo bo, PageQuery pageQuery) {

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
View File

@@ -60,6 +60,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo); QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.orderByDesc("sot.task_rank"); lqw.orderByDesc("sot.task_rank");
lqw.orderByDesc("sot.create_time"); lqw.orderByDesc("sot.create_time");
lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性
Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw); Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@@ -69,6 +70,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo); QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.orderByDesc("sot.own_rank"); lqw.orderByDesc("sot.own_rank");
lqw.orderByDesc("sot.create_time"); lqw.orderByDesc("sot.create_time");
lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性
Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw); Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@@ -96,6 +98,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
.or() .or()
.isNotNull("soti.files"); .isNotNull("soti.files");
lqw.orderByDesc("sot.create_time"); lqw.orderByDesc("sot.create_time");
lqw.orderByAsc("sot.task_id"); // 添加task_id作为最终排序条件，确保结果唯一性
Page<SysOaTaskVo> result = baseMapper.queryPageListDocument(pageQuery.build(), lqw); Page<SysOaTaskVo> result = baseMapper.queryPageListDocument(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }