diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index db4ae17..cf1f53c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -5,6 +5,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; @@ -509,7 +510,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { } BackApplyInfo backApplyInfo = new BackApplyInfo(); backApplyInfo.setAgreementId(tmTaskAgreement.getAgreementId().intValue()); - backApplyInfo.setMaId(bean.getMaId().intValue()); + backApplyInfo.setMaId(Objects.isNull(bean.getMaId()) ? 0 : bean.getMaId().intValue()); backApplyInfo.setTypeId(String.valueOf(bean.getTypeId())); backApplyInfo.setCompanyId(String.valueOf(bean.getCompanyId())); backApplyInfo.setBackNum(bean.getScrapNum().intValue());