From 00522f31315c8e6277f20633539bf732392435c8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Mon, 16 Sep 2024 21:27:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=8A=84=E9=80=81?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/service/impl/FlwTaskServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/workflow/FlwTaskMapper.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 5f52eba03..69e16a197 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
@@ -202,6 +202,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
         queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
         queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
         queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
+        queryWrapper.orderByDesc("t.create_time");
     }
 
     /**
@@ -238,7 +239,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
     @Override
     public TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
         QueryWrapper<FlowTaskBo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName());
         queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
         queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
         Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
index 0a10a3de8..6544f77a4 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
@@ -104,20 +104,20 @@
     <select id="getTaskCopyByPage" resultMap="FlowTaskResult">
        select * from (
          SELECT
+             b.id ,
              b.flow_status,
              b.business_id,
              a.create_time,
              b.node_name,
              b.node_code,
-             b.id ,
              d.flow_name,
-             d.flow_code,
+             d.flow_code
          FROM
              `flow_user` a
              LEFT JOIN flow_instance b ON a.associated = b.id
              LEFT JOIN flow_definition d on b.definition_id=d.id
          WHERE
-             a.type = 4 ORDER BY create_time DESC
+             a.type = 4
        ) t ${ew.getCustomSqlSegment}
     </select>
 </mapper>