From e51a46522f053cba29df99a2d559b893a17bf1d7 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 10 Feb 2026 17:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ma/service/impl/MachineServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
index 171915d2..2a9a1fdb 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
@@ -556,9 +556,15 @@ public class MachineServiceImpl implements IMachineService
         baseInfo.setScrapTime(scrapTime != null ? scrapTime.getScrapTime() : "暂无");
         // 查询领料任务
         LeaseApplyInfo leaseInfo = machineMapper.getLeaseDataByMaId(machine);
-        baseInfo.setLeaseTime(leaseInfo.getLeaseTime());
-        baseInfo.setLeaseUnit(leaseInfo.getUnitName());
-        baseInfo.setLeaseProject(leaseInfo.getProjectName());
+        if(leaseInfo != null){
+            baseInfo.setLeaseTime(String.valueOf(leaseInfo.getLeaseTime()));
+            baseInfo.setLeaseUnit(leaseInfo.getUnitName());
+            baseInfo.setLeaseProject(leaseInfo.getProjectName());
+        }else{
+            baseInfo.setLeaseTime(null);
+            baseInfo.setLeaseUnit(null);
+            baseInfo.setLeaseProject(null);
+        }
 //        LeaseApplyInfo leaseInfo = machineMapper.getLeaseParentId(machine);
 //        if (leaseInfo == null || leaseInfo.getParentId() == null) {
 //            baseInfo.setLeaseTime(null);