From 0d62de69259b89a29638cb4f578af10a7b269284 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 27 Sep 2022 16:31:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=8D=95=E6=8D=AE=E6=B5=81=E6=B0=B4=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8D=95=E6=8D=AE=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8D=95=E6=8D=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=E6=97=A0=E6=B3=95=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/udi/admin/service/inout/OrderService.java     | 2 ++
 src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
index 0057635..1f5e51a 100644
--- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
+++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java
@@ -93,6 +93,8 @@ public class OrderService {
     private static QueryWrapper<OrderEntity> buildQueryWrapper(OrderFilterRequest orderFilterRequest) {
         QueryWrapper<OrderEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "orderId", orderFilterRequest.getId())
+                .or(StrUtil.isNotBlank(orderFilterRequest.getId()))
+                .eq(StrUtil.isNotBlank(orderFilterRequest.getId()),"corpOrderId", orderFilterRequest.getId())
                 .in(CollUtil.isNotEmpty(orderFilterRequest.getInvCodes()), "locStorageCode", orderFilterRequest.getInvCodes())
                 .ge(StrUtil.isNotBlank(orderFilterRequest.getStartTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getStartTime()) ? null : DateUtil.parse(orderFilterRequest.getStartTime()).toString(DatePattern.NORM_DATETIME_PATTERN))
                 .le(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getEndTime()) ? null : DateUtil.parse(orderFilterRequest.getEndTime()).toString(DatePattern.NORM_DATETIME_PATTERN))
diff --git a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 898ec55..f7a79bb 100644
--- a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -300,7 +300,7 @@
             <if test="customerId != null and customerId != ''">
                 customerId=#{customerId},
             </if>
-            <if test="prefix != null and prefix != ''">
+            <if test="prefix != null">
                 prefix=#{prefix},
             </if>
             thirdSysFk=#{thirdSysFk},