From 134fc581acd834ea1594f299a0910d63447c9333 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 12:05:20 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java
index 8e633b429..f8343b0b9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteServiceImpl.java
@@ -84,7 +84,7 @@ public class EmisSiteServiceImpl extends EmisBaseService implements IEmisSiteSer
         emisDestination.setCountry(emisSite.getCountryCode());
         emisDestination.setDestName(emisSite.getSiteName());
         emisDestination.setDestNameEn(emisSite.getSiteNameEn());
-        emisDestination.setStatus(0);
+        emisDestination.setStatus(1);
         emisDestination.setSiteCode(emisSite.getSiteCode());
         emisDestination.setProvince(emisSite.getProvince());
         emisDestination.setCity(emisSite.getCity());
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 2440dce74..9f9341020 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -293,9 +293,9 @@
         <where>
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="orderSn != null  and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
+            <if test="orderSn != null  and orderSn != ''"> and FIND_IN_SET(`order_sn`,#{orderSn}) </if>
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id like concat('%', #{custOrderId}, '%')</if>
-            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and FIND_IN_SET(`bill_code`,#{billCode}) </if>
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
             <if test="orderStatus != null  and orderStatus != ''"> and order_status like concat('%', #{orderStatus}, '%')</if>
             <if test="waybillStatus != null  and waybillStatus != ''"> and waybill_status like concat('%', #{waybillStatus}, '%')</if>