From fafd6f48cdfebddb8c7686380cf8ff304f8079ed Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 13 Dec 2022 11:00:19 +0800
Subject: [PATCH] ...

---
 .../mapper/activiti/ProcessActivityDao.xml    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
index eb40161e..2995f245 100644
--- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
+++ b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
@@ -29,12 +29,20 @@
     </resultMap>
 
     <select id="getMyProcessInstancePage" parameterType="map" resultMap="ProcessActivityEntity">
-        SELECT aht.*, arp.NAME_ as DEF_NAME, ahp.BUSINESS_KEY_, ahp.START_TIME_, ahp.END_TIME_,
-        ahp.START_USER_ID_, arp.VERSION_ as DEF_VERSION_
-        FROM (SELECT DISTINCT PROC_DEF_ID_, PROC_INST_ID_,ASSIGNEE_ FROM ACT_HI_TASKINST) aht
-        LEFT JOIN ACT_HI_PROCINST ahp on aht.PROC_INST_ID_ = ahp.PROC_INST_ID_
-        LEFT JOIN ACT_RE_PROCDEF arp on aht.PROC_DEF_ID_ = arp.ID_
-        WHERE aht.ASSIGNEE_ = #{userId}
+        SELECT
+        aht.*,
+        arp.NAME_ AS DEF_NAME,
+        ahp.BUSINESS_KEY_,
+        ahp.START_TIME_,
+        ahp.END_TIME_,
+        ahp.START_USER_ID_,
+        arp.VERSION_ AS DEF_VERSION_
+        FROM
+            ( SELECT DISTINCT PROC_DEF_ID_, PROC_INST_ID_, ASSIGNEE_ FROM ACT_HI_TASKINST ) aht
+            LEFT JOIN ACT_HI_PROCINST ahp ON aht.PROC_INST_ID_ = ahp.PROC_INST_ID_
+            LEFT JOIN ACT_RE_PROCDEF arp ON aht.PROC_DEF_ID_ = arp.ID_
+        WHERE
+            aht.ASSIGNEE_ = #{userId}
         <if test="processInstanceId != null">
             and aht.PROC_INST_ID_ = #{processInstanceId}
         </if>
@@ -59,7 +67,7 @@
         <if test="ended != null">
             and ahp.END_TIME_ IS NOT NULL
         </if>
-        ORDER BY
+            ORDER BY
         ahp.START_TIME_ DESC
     </select>