wks vor 1 Jahr
Ursprung
Commit
867459cf26

+ 6 - 0
src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreementAttribution.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementAttributionDto;
 import com.ydtech.modules.protocol.entity.dto.PtlAttributionTemplateDto;
 import lombok.*;
+import org.springframework.util.ObjectUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -107,12 +108,17 @@ public class PtlAgreementAttribution implements Serializable {
      * @param ptlInsAttributionTemplate 协议归属模版
      */
     public static void filterTemplates(PtlAgreementAttribution ptlAgreementAttribution, PtlInsAttributionTemplate ptlInsAttributionTemplate) {
+        if (ObjectUtils.isEmpty(ptlInsAttributionTemplate)) {
+            return;
+        }
+
         List<PtlAttributionTemplateDto> ptlAttributionTemplateDtoList = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
         // 信息
         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 -> {
             String s = map.get(x.getField());