Enhance filtering logic in LeaseApplyInfoServiceImpl for improved query accuracy
This commit is contained in:
parent
85f91ac8d7
commit
510d85723c
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue