From 31b70ce42efdc9de1c469a2a7d912fcadae49fdb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 7 Sep 2024 22:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/impl/ScrapApplyDetailsServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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());