From c9778a767e826b7ca2820856015ecaf8cfc09d5b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 4 Mar 2024 09:53:02 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-4=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=A2=E6=88=B7=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/wms/BaseSupplierMapper.xml | 9 +++------
 .../src/main/resources/mapper/wms/SysCustomerMapper.xml  | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseSupplierMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseSupplierMapper.xml
index d5b8ca95..91cfcfe8 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseSupplierMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseSupplierMapper.xml
@@ -41,9 +41,7 @@
     <select id="selectBaseSupplierList" parameterType="BaseSupplier" resultMap="BaseSupplierResult">
         <include refid="selectBaseSupplierVo"/>
         <where>
-            <if test="supplierCode != null  and supplierCode != ''">and supplier_code like concat('%', #{supplierCode},
-                '%')
-            </if>
+            <if test="supplierCode != null  and supplierCode != ''">and supplier_code like concat('%', #{supplierCode},'%')</if>
             <if test="zhDesc != null  and zhDesc != ''">and zh_desc like concat('%', #{zhDesc}, '%')</if>
             <if test="enDesc != null  and enDesc != ''">and en_desc = #{enDesc}</if>
             <if test="supplierType != null  and supplierType != ''">and supplier_type = #{supplierType}</if>
@@ -56,9 +54,7 @@
             <if test="address != null  and address != ''">and address = #{address}</if>
             <if test="postcode != null  and postcode != ''">and postcode = #{postcode}</if>
             <if test="contact != null  and contact != ''">and contact like concat('%', #{contact}, '%')</if>
-            <if test="contactPhone != null  and contactPhone != ''">and contact_phone like concat('%', #{contactPhone},
-                '%')
-            </if>
+            <if test="contactPhone != null  and contactPhone != ''">and contact_phone like concat('%', #{contactPhone},'%')</if>
             <if test="contactPosition != null  and contactPosition != ''">and contact_position = #{contactPosition}</if>
             <if test="contactEmail != null  and contactEmail != ''">and contact_email = #{contactEmail}</if>
             <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
@@ -67,6 +63,7 @@
             <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
             and del_flag = '0'
         </where>
+        order by supplier_code asc
     </select>
 
     <select id="selectBaseSupplierBySupplierId" parameterType="String" resultMap="BaseSupplierResult">
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml
index fe8b8381..ef3e37f7 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml
@@ -45,10 +45,8 @@
         <include refid="selectSysCustomerVo"/>
         <where>
             <if test="clientId != null  and clientId != ''">and client_id = #{clientId}</if>
-            <if test="clientCode != null  and clientCode != ''">and client_code like concat('%', #{clientCode}, '%')
-            </if>
-            <if test="clientName != null  and clientName != ''">and client_name like concat('%', #{clientName}, '%')
-            </if>
+            <if test="clientCode != null  and clientCode != ''">and client_code like concat('%', #{clientCode}, '%')</if>
+            <if test="clientName != null  and clientName != ''">and client_name like concat('%', #{clientName}, '%')</if>
             <if test="clientNick != null  and clientNick != ''">and client_nick = #{clientNick}</if>
             <if test="clientEn != null  and clientEn != ''">and client_en = #{clientEn}</if>
             <if test="clientDes != null  and clientDes != ''">and client_des = #{clientDes}</if>
@@ -72,6 +70,7 @@
             <if test="attr4 != null ">and attr4 = #{attr4}</if>
             and del_flag = '0'
         </where>
+        order by client_code asc
     </select>
 
     <select id="selectSysCustomerByClientId" parameterType="java.lang.String" resultMap="SysCustomerResult">