From 775fbf15e273a194f373914ef0316a1b01b349a5 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Thu, 26 Sep 2024 17:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=A4=A7=E7=B1=BB=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/material/service/MaterialExcelService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
index 2c7d50eb..feda5cfa 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
@@ -558,7 +558,7 @@ public class MaterialExcelService {
 
         // 11、51 && 一次性物料，新申请，则运算起始时间为申请日期一年之后
         if ((materialCategoryCode.startsWith("10") || materialCategoryCode.startsWith("50"))
-                && to.getReuseOfOnceState() == 1) {
+                && ObjectUtil.isNotEmpty(to.getReuseOfOnceState()) && to.getReuseOfOnceState() == 1) {
             Date startDate = Date.from(LocalDate.now().plusYears(1L).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
             to.setFreezeCalcStart(startDate);
         }