From 5112c933d335bfd0ac69cd400af9b38f1b7cbe9a Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 26 Jul 2022 13:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=80=BCput=E7=A9=BA=E4=B8=B2=202022=E5=B9=B47?=
 =?UTF-8?q?=E6=9C=8826=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/print/service/impl/OutBoxPrintServiceImpl.java    | 2 ++
 .../modules/print/service/impl/RollPrintServiceImpl.java      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java b/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java
index 47d1bd2..7835041 100644
--- a/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java
@@ -129,6 +129,8 @@ public class OutBoxPrintServiceImpl implements OutBoxPrintService {
                 // 当返回的数据中没有映射的key时 提示属性未维护
                 for (String key : itemMap.keySet()) {
                     String dbName = itemMap.get(key);
+                    // 为所有key 附上默认值
+                    itemMap.put(key,"");
                     // 数据库 $开头 数量 #开头 手工参数  排除
                     if (dbName.indexOf("$") != 0 && dbName.indexOf("#") != 0 && key.indexOf("流水号") != 0) {
                         if (!boxPrintData.containsKey(dbName)) {
diff --git a/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java b/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
index 37d651d..05c3306 100644
--- a/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
@@ -154,7 +154,7 @@ public class RollPrintServiceImpl implements RollPrintService {
         Date date = new Date();
         List<Labelprinthist> histsList = new ArrayList<>();
         // 打印数据 集合
-        List<Map<String,Object>> printList = new ArrayList<>();
+        List<Map<String, Object>> printList = new ArrayList<>();
         // 打印API 地址
         String apiAddress = "";
         // 循环不同模板打印
@@ -192,6 +192,8 @@ public class RollPrintServiceImpl implements RollPrintService {
                 // 当返回的数据中没有映射的key时 提示属性未维护
                 for (String key : itemMap.keySet()) {
                     String dbName = itemMap.get(key);
+                    // 为所有key 附上默认值
+                    itemMap.put(key,"");
                     // 数据库 $开头 数量 #开头 手工参数  排除
                     if (dbName.indexOf("$") != 0 && dbName.indexOf("#") != 0) {
                         if (!printData.containsKey(dbName)) {