diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index ad754e07b..0549c36cc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -220,6 +220,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { } } wrapper.eq(FlowInstance::getCreateBy, LoginHelper.getUserIdStr()); + wrapper.orderByDesc(FlowInstance::getCreateTime); Page page = flowInstanceMapper.selectPage(pageQuery.build(), wrapper); TableDataInfo build = TableDataInfo.build(); List flowInstanceVos = BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 7806cffc3..497973031 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -275,6 +275,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); + queryWrapper.orderByDesc("t.create_time").orderByDesc("t.update_time"); Page page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); return TableDataInfo.build(page); }