|
|
@@ -109,7 +109,9 @@ public class PtlAgreementAttribution implements Serializable {
|
|
|
public static void filterTemplates(PtlAgreementAttribution ptlAgreementAttribution, PtlInsAttributionTemplate ptlInsAttributionTemplate) {
|
|
|
List<PtlAttributionTemplateDto> ptlAttributionTemplateDtoList = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
|
|
|
// 信息
|
|
|
- Map<String, String> map = ptlAttributionTemplateDtoList.stream().collect(Collectors.toMap(PtlAttributionTemplateDto::getField, PtlAttributionTemplateDto::getValue, (v1, v2) -> v1));
|
|
|
+ Map<String, String> map = ptlAttributionTemplateDtoList.stream()
|
|
|
+ .filter(dto->dto.getValue() != null)
|
|
|
+ .collect(Collectors.toMap(PtlAttributionTemplateDto::getField, PtlAttributionTemplateDto::getValue, (v1, v2) -> v1));
|
|
|
// 模版中的数据
|
|
|
List<PtlAttributionTemplateDto> ptlAttributionTemplate = ptlInsAttributionTemplate.getFields().toJavaList(PtlAttributionTemplateDto.class);
|
|
|
ptlAttributionTemplate.forEach(x -> {
|