From a155736605e972faf90752dfba5b6d1c3d2c0909 Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Sat, 11 Oct 2025 14:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=B9=E8=B1=A1=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datadump/service/impl/DataImportBatchServiceImpl.java | 4 ++--
 .../datadump/service/impl/DataImportNewServiceImpl.java   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
index ffa7b43..25d8e64 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
@@ -878,7 +878,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
                                 continue;
                             }
                             Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
-                            if (!m.isEmpty() && m.get("new_id") != null) {
+                            if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                 account.put(field, m.get("new_id"));
                             }else {
                                 message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@@ -1336,7 +1336,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
                             }
 
                             Map<String, Object> m = customMapper.getById("new_id", reference_to, data.get(j - 1).get(dataField.getField()).toString());
-                            if (!m.isEmpty() && m.get("new_id") != null) {
+                            if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                 account.put(dataField.getField(), m.get("new_id"));
                             }else {
                                 message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(dataField.getField()) +"异常！";
diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
index 33f8c7e..607f901 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
@@ -856,7 +856,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                         continue;
                                     }
                                     Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
-                                    if (!m.isEmpty() && m.get("new_id") != null) {
+                                    if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                         account.setField(field, m.get("new_id"));
                                     }else {
                                         message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@@ -1073,7 +1073,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                         continue;
                                     }
                                     Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
-                                    if (!m.isEmpty() && m.get("new_id") != null) {
+                                    if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                         account.setField(field, m.get("new_id"));
                                     }else {
                                         message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@@ -3505,7 +3505,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                         continue;
                                     }
                                     Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
-                                    if (!m.isEmpty() && m.get("new_id") != null) {
+                                    if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                         account.setField(field, m.get("new_id"));
                                     }else {
                                         message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"异常！";
@@ -3740,7 +3740,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                         continue;
                                     }
                                     Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
-                                    if (!m.isEmpty() && m.get("new_id") != null) {
+                                    if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
                                         account.setField(field, m.get("new_id"));
                                     }else {
                                         message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"异常！";