From 6e64fd7fd77c822aa08f0f3dcee7cc13c66401a4 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 11 九月 2024 09:27:20 +0800 Subject: [PATCH] !585 修复工作流分页查询不兼容sql server的问题 Merge pull request !585 from 赖小麦/fix_workflow_page_query_error_to_sqlserver --- ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml index d1508ab..3641900 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml @@ -41,8 +41,7 @@ FROM ACT_RU_TASK RES INNER JOIN ACT_HI_PROCINST AHP ON RES.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = RES.PROC_DEF_ID_ - WHERE RES.PARENT_TASK_ID_ IS NULL - ORDER BY RES.CREATE_TIME_ DESC) t ${ew.getCustomSqlSegment} + WHERE RES.PARENT_TASK_ID_ IS NULL) t ${ew.getCustomSqlSegment} </select> <select id="getTaskFinishByPage" resultMap="TaskVoResult"> @@ -57,7 +56,7 @@ INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_ WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL - ORDER BY HTI.START_TIME_ DESC) t ${ew.getCustomSqlSegment} + ) t ${ew.getCustomSqlSegment} </select> <select id="getTaskCopyByPage" resultMap="TaskVoResult"> @@ -73,6 +72,6 @@ INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_ WHERE AHT.PARENT_TASK_ID_ IS NOT NULL and AHT.scope_type_ = 'copy' - ORDER BY AHT.START_TIME_ DESC) t ${ew.getCustomSqlSegment} + ) t ${ew.getCustomSqlSegment} </select> </mapper> -- Gitblit v1.9.3