From d521574abceb2f5939af69e20aa264d5c4c4a884 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Mon, 9 Jun 2025 23:41:38 +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

---
 .../controller/ApprovalProcessController.java | 19 +++++++++++++------
 .../controller/gwglLogController.java         |  2 +-
 2 files changed, 14 insertions(+), 7 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 af14d09..dcb033b 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
@@ -55,9 +55,9 @@ public class ApprovalProcessController extends BaseController {
             }
         }
 
-        if (approvalProcess.getProcessTitle() != null) {
-            queryWrapper.like("process_title", approvalProcess.getProcessTitle())
-                    .or().like("submitter_name", approvalProcess.getProcessTitle());
+        if (approvalProcess.getProcessTitles() != null) {
+            queryWrapper.like("process_title", approvalProcess.getProcessTitles())
+                    .or().like("submitter_name", approvalProcess.getProcessTitles());
         }
 
         if (approvalProcess.getSubmitterId() != null) {
@@ -81,6 +81,9 @@ public class ApprovalProcessController extends BaseController {
                             process.setApprovalStatus(1);
                         }
                     }
+                    else {
+                        continue;
+                    }
                 }else {
                     continue;
                 }
@@ -99,6 +102,8 @@ public class ApprovalProcessController extends BaseController {
                         } else {
                             process.setApprovalStatus(1);
                         }
+                    }else {
+                        continue;
                     }
                 }else {
                     continue;
@@ -118,6 +123,8 @@ public class ApprovalProcessController extends BaseController {
                         } else {
                             process.setApprovalStatus(1);
                         }
+                    }else {
+                        continue;
                     }
                 }else {
                     continue;
@@ -212,9 +219,9 @@ public class ApprovalProcessController extends BaseController {
                 queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L);
             }
         }
-        if (approvalProcess.getProcessTitle() != null) {
-            queryWrapper.like("process_title", approvalProcess.getProcessTitle())
-                    .or().like("submitter_name", approvalProcess.getProcessTitle());
+        if (approvalProcess.getProcessTitles() != null) {
+            queryWrapper.like("process_title", approvalProcess.getProcessTitles())
+                    .or().like("submitter_name", approvalProcess.getProcessTitles());
         }
         queryWrapper.eq("submitter_id", getLoginUser().getUserId());
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java b/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java
index 2363ace..b1eeb7e 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java
@@ -31,7 +31,7 @@ public class gwglLogController extends BaseController {
     public TableDataInfo query(@RequestBody gwglLog gwglLog){
         startPage();
         QueryWrapper<gwglLog> queryWrapper = new QueryWrapper<>(gwglLog);
-        queryWrapper.orderByDesc("create_time");
+//        queryWrapper.orderByDesc("create_time");
         return getDataTable(gwglLogService.list(queryWrapper));
     }