From ceecad744eb49aa03170efd91e2b68680f5db69b Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 18 Feb 2025 13:48:07 +0800
Subject: [PATCH] 20240218

---
 .../label/service/impl/PrintLabelRecordServiceImpl.java       | 4 +++-
 .../label/service/impl/PrintRollLabelRecordServiceImpl.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
index 799e9fb..107966c 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
@@ -151,7 +151,9 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
                     .eq(ManufacturerInformationData::getSite, printLabelRecord.getSite())
                     .eq(ManufacturerInformationData::getManufacturerNo, printLabelRecord.getManufacturerNo())
                     .one();
-            str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
+            if (Objects.nonNull(manufacturer)){
+                str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
+            }
         }
 
         // 打印张数
diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
index e8c58df..30c485f 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
@@ -90,7 +90,9 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
                     .eq(ManufacturerInformationData::getSite, printRollLabelRecord.getSite())
                     .eq(ManufacturerInformationData::getManufacturerNo, printRollLabelRecord.getManufacturerNo())
                     .one();
-            str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse("00");
+            if (Objects.nonNull(manufacturer)){
+                str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
+            }
         }
 
         List<PrintRollLabelRecord> printRollLabelRecords = new ArrayList<>();