From 510d85723c7e65eb1d92c8ebbfec961d9e069158 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Fri, 7 Nov 2025 16:56:42 +0800
Subject: [PATCH] Enhance filtering logic in LeaseApplyInfoServiceImpl for
 improved query accuracy

---
 .../lease/service/impl/LeaseApplyInfoServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 8fac0a8a..e03e0264 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -766,8 +766,19 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
                         new HashSet<>(statusList);
 
                 sortedList = sortedList.stream()
+                        // 关键词
                         .filter(item -> StringUtils.isBlank(keyWord) || containsKeyword(item, keyWord))
+                        // 状态过滤
                         .filter(item -> statusSet.isEmpty() || statusSet.contains(item.getTaskStatus()))
+                        // 租赁单位
+                        .filter(item -> leaseApplyInfo.getLeaseUnitId() == null
+                                || Objects.equals(item.getLeaseUnitId(), leaseApplyInfo.getLeaseUnitId()))
+                        // 租赁工程
+                        .filter(item -> leaseApplyInfo.getLeaseProjectId() == null
+                                || Objects.equals(item.getLeaseProjectId(), leaseApplyInfo.getLeaseProjectId()))
+                        // 分公司
+                        .filter(item -> StringUtils.isBlank(leaseApplyInfo.getImpUnitName())
+                                || Objects.equals(item.getImpUnitName(), leaseApplyInfo.getImpUnitName()))
                         .collect(Collectors.toList());
             }
             return sortedList;