From 4354d257e69236076c6c86463e2871415b1a5f0c Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 11 Dec 2024 18:30:41 +0800
Subject: [PATCH] =?UTF-8?q?style=20workflow=20xml=20=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/workflow/FlwDefMapper.xml          |  24 ++--
 .../mapper/workflow/FlwTaskMapper.xml         | 110 ++++++++++--------
 2 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
index 565aee3d8..d95e737b6 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
@@ -5,16 +5,20 @@
 <mapper namespace="org.dromara.workflow.mapper.FlwDefMapper">
     <select id="page" resultType="org.dromara.warm.flow.orm.entity.FlowDefinition">
         select *
-        from (select a.* from flow_definition a
-        join (
-            select flow_code,
-                   coalesce(
-                       max(case when is_publish = 1 then version end),
-                       max(version)
-                   ) as version
-            from flow_definition group by flow_code
-        ) b
-        on (a.flow_code = b.flow_code and a.version = b.version) where a.del_flag = '0') t
+        from (
+            select a.*
+            from flow_definition a
+                    join (
+                        select flow_code,
+                               coalesce(
+                                   max(case when is_publish = 1 then version end),
+                                   max(version)
+                               ) as version
+                        from flow_definition
+                        group by flow_code
+                    ) b on (a.flow_code = b.flow_code and a.version = b.version)
+            where a.del_flag = '0'
+        ) t
         ${ew.getCustomSqlSegment}
     </select>
 
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 b91a1e7e2..be7ccc31d 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
@@ -47,35 +47,37 @@
         <result property="delFlag" column="del_flag"/>
         <result property="formPath" column="form_path"/>
     </resultMap>
+
     <select id="getTaskWaitByPage" resultMap="FlowTaskResult">
-        select*from (
-         select
-         distinct t.id,
-         t.node_code,
-         t.node_name,
-         t.node_type,
-         t.definition_id,
-         t.instance_id,
-         t.create_time,
-         t.update_time,
-         t.tenant_id,
-         i.business_id,
-         i.flow_status,
-         d.flow_name,
-         d.flow_code,
-         d.form_custom,
-         d.form_path,
-         d.version,
-         uu.processed_by,
-         uu.type
-         from flow_task as t
-         left join flow_user uu on uu.associated = t.id
-         left join flow_definition d on t.definition_id = d.id
-         left join flow_instance i on t.instance_id = i.id where
-         t.node_type = 1 and
-         t.del_flag = '0' and
-         uu.del_flag = '0' and
-         uu.type in ('1','2','3')) t
+        select * from (
+            select distinct
+                t.id,
+                t.node_code,
+                t.node_name,
+                t.node_type,
+                t.definition_id,
+                t.instance_id,
+                t.create_time,
+                t.update_time,
+                t.tenant_id,
+                i.business_id,
+                i.flow_status,
+                d.flow_name,
+                d.flow_code,
+                d.form_custom,
+                d.form_path,
+                d.version,
+                uu.processed_by,
+                uu.type
+            from flow_task as t
+                    left join flow_user uu on uu.associated = t.id
+                    left join flow_definition d on t.definition_id = d.id
+                    left join flow_instance i on t.instance_id = i.id
+            where t.node_type = 1
+              and t.del_flag = '0'
+              and uu.del_flag = '0'
+              and uu.type in ('1','2','3')
+         ) t
          ${ew.getCustomSqlSegment}
     </select>
 
@@ -106,32 +108,38 @@
                 c.flow_code,
                 c.version
             from flow_his_task a
-            left join flow_instance b on a.instance_id = b.id
-            left join flow_definition c on a.definition_id = c.id where
-            a.del_flag ='0' and b.del_flag = '0' and c.del_flag = '0' and a.node_type in ('1','3','4')
-        ) t ${ew.getCustomSqlSegment}
+                    left join flow_instance b on a.instance_id = b.id
+                    left join flow_definition c on a.definition_id = c.id
+            where a.del_flag ='0'
+              and b.del_flag = '0'
+              and c.del_flag = '0'
+              and a.node_type in ('1','3','4')
+        ) t
+        ${ew.getCustomSqlSegment}
     </select>
 
     <select id="getTaskCopyByPage" resultMap="FlowTaskResult">
        select * from (
-         select
-             b.id ,
-             a.processed_by,
-             c.flow_status,
-             c.business_id,
-             a.create_time,
-             b.node_name,
-             b.node_code,
-             d.flow_name,
-             d.flow_code,
-             d.version
-         from
-             flow_user a
-             left join flow_his_task b on a.associated = b.task_id
-             left join flow_instance c on b.instance_id = c.id
-             left join flow_definition d on c.definition_id=d.id
-         where
-             a.type = '4' and a.del_flag = '0' and b.del_flag = '0' and d.del_flag = '0'
-       ) t ${ew.getCustomSqlSegment}
+            select
+                b.id ,
+                a.processed_by,
+                c.flow_status,
+                c.business_id,
+                a.create_time,
+                b.node_name,
+                b.node_code,
+                d.flow_name,
+                d.flow_code,
+                d.version
+            from flow_user a
+                left join flow_his_task b on a.associated = b.task_id
+                left join flow_instance c on b.instance_id = c.id
+                left join flow_definition d on c.definition_id=d.id
+            where a.type = '4'
+               and a.del_flag = '0'
+               and b.del_flag = '0'
+               and d.del_flag = '0'
+            ) t
+        ${ew.getCustomSqlSegment}
     </select>
 </mapper>