From 8346812955e4de99727a429d2e4c41691eb27209 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 20 Sep 2024 18:32:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml               |  2 +-
 .../mapper/collect/IoCollectOrderOriginMapper.xml    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 815fbe996..fbdbde7dd 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 077fd603d..69abca2d0 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
@@ -157,12 +157,12 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </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.fromType like concat('%', #{keywords}, '%'))
-            </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.fromType like concat('%', #{keywords}, '%'))-->
+<!--            </if>-->
         </where>
         GROUP BY
         ico.billNo