From 5b7b821e8b227ce6aadc875410246a28b7893b3a Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Tue, 10 Jun 2025 00:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/ApprovalProcessController.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
index 6bfbb73..f530da1 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
@@ -61,7 +61,7 @@ public class ApprovalProcessController extends BaseController {
         }
 
         if (approvalProcess.getSubmitterId() != null) {
-            queryWrapper.eq("submitter_id", getLoginUser().getUserId());
+            queryWrapper.eq("submitter_id", approvalProcess.getSubmitterId());
         }
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
         List<ApprovalProcess> newList = new ArrayList<>();
@@ -86,7 +86,7 @@ public class ApprovalProcessController extends BaseController {
                     continue;
                 }
             }
-            if (process.getMatterType() == 3) {
+            else if (process.getMatterType() == 3) {
                 List<gwglLog> list1 = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getApplyNo, process.getApprovalNo())
                         .orderByAsc(gwglLog::getCreateTime).list();
@@ -106,7 +106,7 @@ public class ApprovalProcessController extends BaseController {
                     continue;
                 }
             }
-            if (process.getMatterType() == 4) {
+            else if (process.getMatterType() == 4) {
                 List<gwglLog> list1 = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getApplyNo, process.getApprovalNo())
                         .orderByAsc(gwglLog::getCreateTime).list();
@@ -125,6 +125,8 @@ public class ApprovalProcessController extends BaseController {
                 }else {
                     continue;
                 }
+            }else {
+                continue;
             }
 //            如果创建时间为当天的时间
             if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {