|
|
@@ -456,7 +456,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
|
|
|
//1.过滤方案
|
|
|
ptlSchemes.removeIf(ptlScheme -> !insSchemeIds.contains(ptlScheme.getId()));
|
|
|
List<String> companyIds = ptlSchemes.stream().map(ptlScheme -> ptlScheme.getCompanyId()).collect(Collectors.toList());
|
|
|
- companyList.removeIf(company -> !companyIds.contains(company.getId()));
|
|
|
+ // 移除不匹配方案的保司,以及空协议的保司
|
|
|
+ companyList.removeIf(company -> !companyIds.contains(company.getId()) || CollUtil.isEmpty(company.getAgreements()));
|
|
|
List<PtlAgreementInsCompanyVo> resVo = new ArrayList<>();
|
|
|
companyList.forEach(company -> {
|
|
|
PtlAgreementInsCompanyVo vo = new PtlAgreementInsCompanyVo();
|