From 49cc2bd8908ffceaa8d38dd0013d0250b47477bf Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 8 Nov 2024 17:10:05 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=A0=B7=E5=BC=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=B5=84=E6=96=99=E5=90=8E=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E8=B4=A7=E8=B5=84=E6=96=99=E5=8D=95=E5=8F=B7=E3=80=81=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8D=95=E5=8F=B7=E3=80=81=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E4=B8=9A=E5=8A=A1=E5=91=98=E9=83=BD=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sales/SalesShippingInformationMapper.xml       | 8 ++++----
 .../salesShippingInformation.html                         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
index ab7bb871..67b14455 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesShippingInformationMapper.xml
@@ -47,13 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSalesShippingInformationList" parameterType="SalesShippingInformation" resultMap="SalesShippingInformationResult">
         <include refid="selectSalesShippingInformationVo"/>
         <where>  
-            <if test="shippingInformationCode != null  and shippingInformationCode != ''"> and shipping_information_code = #{shippingInformationCode}</if>
-            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
-            <if test="outOrderCode != null  and outOrderCode != ''"> and out_order_code = #{outOrderCode}</if>
+            <if test="shippingInformationCode != null  and shippingInformationCode != ''"> and shipping_information_code like concat('%', #{shippingInformationCode}, '%') </if>
+            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
+            <if test="outOrderCode != null  and outOrderCode != ''"> and out_order_code like concat('%', #{outOrderCode}, '%')</if>
             <if test="shippingInformationType != null  and shippingInformationType != ''"> and shipping_information_type = #{shippingInformationType}</if>
             <if test="warehouseOrderType != null  and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
             <if test="warehouseOutType != null  and warehouseOutType != ''"> and warehouse_out_type = #{warehouseOutType}</if>
-            <if test="businessMembers != null  and businessMembers != ''"> and business_members = #{businessMembers}</if>
+            <if test="businessMembers != null  and businessMembers != ''"> and business_members like concat('%', #{businessMembers}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html
index 19fa20bd..0b00efc4 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformation/salesShippingInformation.html
@@ -63,7 +63,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="sales:salesShippingInformation:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="sales:salesShippingInformation:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>