From ec6c04999a8feb53dc3e822ff06a3a1bd970b67d Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 19 Sep 2024 22:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java        |  2 +-
 .../collect/IoCollectOrderCodeManService.java    |  2 +-
 .../mapper/collect/IoCollectOrderMapper.xml      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 0b50222f7..4f168fccc 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -161,7 +161,7 @@ public class IoCollectOrderController extends BaseController {
                 return ResultVOUtils.success(orderResponses.get(0));
             else {
                 IoCollectSet collectSet = collectSetService.getSet();
-                if (IntUtil.value(collectSet.getAutoDealOrder())) {
+                if (IntUtil.value(collectSet.getAutoAllotOrder())) {
                     request.setTagStatus(1);
                     orderResponses = collectOrderService.filterList(request);
                     return ResultVOUtils.success(orderResponses.get(0));
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index 7e766459e..4024de102 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -154,7 +154,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .build();
 
                 if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
-                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getCode());
+                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
                     collectOrder.setShipperName(invWarehouseEntity.getName());
                 }
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index d24e4360a..85660fd5e 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -115,14 +115,14 @@
             <if test="uploadStatus != null">
                 and ico.uploadStatus = #{uploadStatus}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (ico.billNo like concat('%', #{keywords}, '%')
-                or ico.fromCorp like concat('%', #{keywords}, '%')
-                or ico.fromCorpName like concat('%', #{keywords}, '%')
-                or ico.workPlaceCode like concat('%', #{keywords}, '%')
-                or ico.busType like concat('%', #{keywords}, '%')
-                or ico.fromCorpName like concat('%', #{keywords}, '%')
-                or ico.fromType like concat('%', #{keywords}, '%'))
+            <if test="keyWords != null and keyWords != ''">
+                and (ico.billNo like concat('%', #{keyWords}, '%')
+                or ico.fromCorp like concat('%', #{keyWords}, '%')
+                or ico.fromCorpName like concat('%', #{keyWords}, '%')
+                or ico.workPlaceCode like concat('%', #{keyWords}, '%')
+                or ico.busType like concat('%', #{keyWords}, '%')
+                or ico.fromCorpName like concat('%', #{keyWords}, '%')
+                or ico.fromType like concat('%', #{keyWords}, '%'))
             </if>
             <if test="shipperName != '' and shipperName != null">
                 AND ico.shipperName LIKE concat('%', #{shipperName}, '%')