From 419c4a64319e5bf127258ef42c6e2bb50495967a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 23 Jul 2024 09:57:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AEtype=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E5=B7=B2=E5=8F=91=E6=B5=81=E7=A8=8B=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkCenterController.java      |  3 ++-
 .../service/ProcessApprovalRecordService.java | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 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 5c714238..01e02231 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
@@ -136,11 +136,12 @@ public class WorkCenterController {
     public Result<?> getApprovalRecordList(ProcessApprovalRecord processApprovalRecord,
                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                           @RequestParam(name = "type") String type,
                                        HttpServletRequest req) {
         Page<ProcessApprovalRecord> page = new Page<>(pageNo, pageSize);
         Page<ProcessApprovalRecord> pageList;
         try {
-            pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
+            pageList = processApprovalRecordService.pageList(page, processApprovalRecord, type, req);
         }catch (Exception e){
             return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
         }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
index a3d26b78..4b2910d3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
@@ -17,6 +17,7 @@ import com.jero.modules.activiti.process.common.entity.ProcessSnapshot;
 import com.jero.modules.activiti.process.common.service.ProcessSnapshotService;
 import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
+import com.jero.modules.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,14 @@ import java.util.stream.Collectors;
   */
 @Service
 public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRecordMapper, ProcessApprovalRecord> {
+
+    // 已办
+    public static final String COMPLETED_RECORD_LIST = "1";
+    // 已发
+    public static final String SENT_RECORD_LIST = "2";
+    // 流程监控
+    public static final String ALL_RECORD_LIST = "3";
+
     @Resource
     private ISysBaseAPI sysBaseAPI;
 
@@ -57,7 +66,9 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         return this.getOne(wrapper);
     }
 
-    public Page<ProcessApprovalRecord> pageList(Page<ProcessApprovalRecord> page, ProcessApprovalRecord processApprovalRecord, HttpServletRequest req) {
+    public Page<ProcessApprovalRecord> pageList(Page<ProcessApprovalRecord> page, ProcessApprovalRecord processApprovalRecord, String type, HttpServletRequest req) {
+        boolean allSnapshotFlag = type.equals(ALL_RECORD_LIST);
+        String curUserId = UserUtils.getUserId();
         QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){
             wrapper.in("finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(",")));
@@ -74,12 +85,15 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         List<ProcessSnapshot> snapshotList = processSnapshotService.list(processSnapshotWrapper);
         Map<String, List<ProcessSnapshot>> snapshotMap = snapshotList.stream().collect(Collectors.groupingBy(ProcessSnapshot::getTaskId));
         for (ProcessApprovalRecord record : records) {
-            List<ProcessSnapshot> processSnapshots = snapshotMap.get(record.getTaskId());
-            if (CollUtil.isNotEmpty(processSnapshots)) {
-                ProcessSnapshot snapshot = processSnapshots.get(0);
-                record.setSnapshotId(snapshot.getId());
-            }
             String userId = record.getUserId();
+            if (StrUtil.isNotBlank(userId) && (allSnapshotFlag || curUserId.equals(userId))) {
+                List<ProcessSnapshot> processSnapshots = snapshotMap.get(record.getTaskId());
+                if (CollUtil.isNotEmpty(processSnapshots)) {
+                    ProcessSnapshot snapshot = processSnapshots.get(0);
+                    record.setSnapshotId(snapshot.getId());
+                }
+            }
+
             String taskAcceptor = sysBaseAPI.translateUserRealNameFromTable(userId);
             String delegateBy = record.getDelegateBy();
             if (StringUtils.isNotBlank(delegateBy)){