From 361d5907928acfe6e601e196d9343a5ef33bf60c Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 25 Feb 2025 15:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95excel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A1?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8D=95=E5=8F=B7=E5=88=A4?=
 =?UTF-8?q?=E9=87=8D=EF=BC=9B2=E3=80=81=E7=94=9F=E4=BA=A7=E5=8D=95?=
 =?UTF-8?q?=E6=8B=86=E5=8D=95=E5=91=98=E4=BF=A1=E6=81=AF=E7=BC=BA=E7=9C=81?=
 =?UTF-8?q?=E5=80=BC=E5=A1=AB=E5=85=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/files/excel/DefaultOrderImportExcelListener.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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);
         }
     }