From 3998874d751c3a287638c13549e65e8a57e58aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Wed, 19 Mar 2025 15:37:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/service/impl/LeaseTaskServiceImpl.java    | 13 +++++++++++--
 .../mapper/material/lease/LeaseTaskMapper.xml       |  6 ------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
index 70497d04..fb5fbddc 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
@@ -401,6 +401,15 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
         log.info("用户id为{}",userId);
         List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo);
         try {
+            if (!CollectionUtils.isEmpty(list)) {
+                String keyWord = leaseApplyInfo.getKeyWord();
+                // 如果关键字不为空，进行过滤
+                if (!StringUtils.isBlank(keyWord)) {
+                    list = list.stream()
+                            .filter(item -> containsKeyword(item, keyWord))
+                            .collect(Collectors.toList());
+                }
+            }
             for (LeaseApplyInfo leaseApplyInfoNew : list) {
                 //获取当前节点，并根据当前节点获取审核人审核的角色信息
                 if (leaseApplyInfoNew.getNodeId()!=null){
@@ -466,8 +475,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
      */
     private boolean containsKeyword(LeaseApplyInfo item, String keyWord) {
         return (item.getMaTypeNames() != null && item.getMaTypeNames().contains(keyWord)) ||
-                (item.getUnitName() != null && item.getUnitName().contains(keyWord)) ||
-                (item.getProjectName() != null && item.getProjectName().contains(keyWord)) ||
+                (item.getLeaseUnit() != null && item.getLeaseUnit().contains(keyWord)) ||
+                (item.getLeaseProject() != null && item.getLeaseProject().contains(keyWord)) ||
                 (item.getCode() != null && item.getCode().contains(keyWord)) ||
                 (item.getCreateBy() != null && item.getCreateBy().contains(keyWord)) ||
                 (item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index fbd5e5b0..b5da7296 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -610,12 +610,6 @@
                 #{item}
             </foreach>
         </if>
-        <if test="keyWord != null  and keyWord != ''">
-            and (bu.unit_name like concat('%', #{keyWord}, '%') or
-            bp.pro_name like concat('%', #{keyWord}, '%') or
-            mt1.type_name like concat('%', #{keyWord}, '%')
-            )
-        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>