From 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
index 4976f9c..479afa7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -44,7 +44,7 @@
         left join basic_glass_type bgt on bgt.type_id = a.type_id
         <where>
             <if test="glassTypeId != null and glassTypeId != ''">
-                and a.type_id like concat('%',#{glassTypeId},'%')
+                and a.type_id = #{glassTypeId}
             </if>
             <if test="product.id != null and product.id != ''">
                 and a.id like concat('%',#{product.id},'%')
@@ -75,17 +75,26 @@
             </if>
         </where>
 
-        order by id desc
+        order by
+        <if test="orderBy == null ">
+            id desc
+        </if>
+        <if test="orderBy == 'desc'">
+            ${field} desc
+        </if>
+        <if test="orderBy == 'asc'">
+            ${field}
+        </if>
         limit #{offset},#{pageSize}
         ;
     </select>
 
     <select id="selectProduct">
-        select * from sd.product where ${productName}=#{productNameValue}
+        select id from sd.product where ${productName}=#{productNameValue}
     </select>
 
     <select id="selectProductId">
-        select * from sd.product where ${productName}=#{productNameValue} and id != #{id}
+        select id from sd.product where ${productName}=#{productNameValue} and id != #{id}
     </select>
 
     <select id="getPageTotal" >

--
Gitblit v1.8.0