diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java index ceb9ade23..406e94b71 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java @@ -103,6 +103,9 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener private static final String POSITIVE_ERR = "数据需为正数"; private static final String NUMBER_LENGTH_ERR = "数据长度过长"; + private static final String EMPTY_STRING = new String(); + + public DefaultOrderImportExcelListener(OrderImportTempDataMapper orderImportTempDataMapper, OrderService orderService, DictDataApi dictDataApi, SnowFlakeGenerator snowFlakeGenerator, Long orderId, Long taskId) { this.orderImportTempDataMapper = orderImportTempDataMapper; this.orderService = orderService; @@ -251,7 +254,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener if (4 == rowIndex) { validOrderInfoLength(leftKey, leftVal, 64); validOrderInfoLength(rightKey, rightVal, 255); - orderDO.setSplitter(leftVal); + orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftKey : EMPTY_STRING); orderDO.setRemark(rightVal); } orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus()); @@ -272,7 +275,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener * @param val */ private void validCustomOrderNo(String key, String val) { - if (StringUtils.isNotEmpty(val) && orderService.customOrderNoIsExists(val)) { + if (StringUtils.isNotEmpty(val) && !orderService.customOrderNoIsExists(val)) { throw ServiceExceptionUtil.exception(ORDER_IMPORT_ORDER_CUSTOMERNO_EXISTS, key, val); } }