This commit is contained in:
parent
e0a7248b04
commit
5fb2a46e6a
|
|
@ -181,6 +181,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
||||||
}
|
}
|
||||||
// 提取details中的signType和signUrl,单独作为一个集合,并去重
|
// 提取details中的signType和signUrl,单独作为一个集合,并去重
|
||||||
List<LeaseOutSign> approveSignList = details.stream()
|
List<LeaseOutSign> approveSignList = details.stream()
|
||||||
|
.filter(detail -> detail.getSignUrl() != null)
|
||||||
.map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
|
.map(detail -> new LeaseOutSign(detail.getSignType(), detail.getSignUrl()))
|
||||||
.distinct() // 去重操作
|
.distinct() // 去重操作
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
@ -655,7 +656,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
|
||||||
(item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||
|
(item.getLeasePerson() != null && item.getLeasePerson().contains(keyWord)) ||
|
||||||
(item.getLeasePhone() != null && item.getLeasePhone().contains(keyWord)) ||
|
(item.getLeasePhone() != null && item.getLeasePhone().contains(keyWord)) ||
|
||||||
(item.getContractPart() != null && item.getContractPart().contains(keyWord)) ||
|
(item.getContractPart() != null && item.getContractPart().contains(keyWord)) ||
|
||||||
(item.getImpUnitName() != null && item.getImpUnitName().contains(keyWord));
|
(item.getImpUnitName() != null && item.getImpUnitName().contains(keyWord))||
|
||||||
|
(item.getBusinessCode() != null && item.getBusinessCode().contains(keyWord));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue