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 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 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 23718eb..14a3501 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java @@ -863,7 +863,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { continue; } Map 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) +"异常!"; @@ -1080,7 +1080,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { continue; } Map 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) +"异常!"; @@ -3582,7 +3582,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { continue; } Map 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) +"异常!"; @@ -3817,7 +3817,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { continue; } Map 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) +"异常!";