From 85c048f08a57601ca206bb99830df479943d0117 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 28 Nov 2023 17:48:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkCenterController.java      |  2 +-
 .../activiti/mapper/xml/ProcessAllMapper.xml  | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
index f2b60f92..7d55d9ed 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
@@ -93,7 +93,7 @@ public class WorkCenterController {
         QueryWrapper<ProcessAll> queryWrapper = getProcessAllQueryWrapper(processAll);
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = loginUser.getId();
-        queryWrapper.eq("pa.user_id",userId);
+        queryWrapper.eq("pa.create_user_id",userId);
 
         Page<ProcessAll> page = new Page<>(pageNo, pageSize);
         IPage<ProcessAll> sentList = processAllService.getSentList(page, queryWrapper);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
index 5ee2ab74..e9b4390b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
@@ -9,15 +9,37 @@
     </select>
 
     <select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">
-        select p.*, group_concat(par.user_id) as handleUserId, par.node_id
+        select p.id,
+               p.prc_name,
+               p.process_instance_id,
+               p.prc_mes,
+               p.prc_num,
+               p.create_user_id,
+               p.prc_type,
+               p.prc_status,
+               p.create_user_name,
+               p.mes,
+               p.create_time,
+               p.end_time,
+               p.over_time,
+               p.due_time,
+               p.project_id,
+               p.project_name,
+               p.prc_name_en,
+               group_concat(par.user_id) as handleUserId,
+               par.node_id
         from (
-                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime, par.node_id
+                 select pa.*,
+                        max(par.create_time) as receivedTaskTime,
+                        max(par.end_time)    as completedTaskTime,
+                        par.node_id
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
              ) p
                  left join process_approval_record par on p.process_instance_id = par.process_instance_id
-        WHERE par.finish_flag = 0 or par.id is null
+        WHERE par.finish_flag = 0
+           or par.id is null
         group by p.process_instance_id
     </select>