From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 cd28050..dd28dd4 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -47,7 +47,7 @@
                 and a.type_id like concat('%',#{glassTypeId},'%')
             </if>
             <if test="product.id != null and product.id != ''">
-                and a.id like like concat('%',#{product.id},'%')
+                and a.id like concat('%',#{product.id},'%')
             </if>
             <if test="product.productName != null and product.productName != ''">
                 and a.product_name like concat('%',#{product.productName},'%')
@@ -64,6 +64,9 @@
             <if test="product.creator != null and product.creator != ''">
                 and a.creator like concat('%',#{product.creator},'%')
             </if>
+            <if test="product.state != null">
+                and a.state = #{product.state}
+            </if>
             <if test="product.createTime != null and product.createTime != ''">
                 and date(a.create_time) like concat('%',#{product.createTime},'%')
             </if>
@@ -74,6 +77,14 @@
         ;
     </select>
 
+    <select id="selectProduct">
+        select * from sd.product where ${productName}=#{productNameValue}
+    </select>
+
+    <select id="selectProductId">
+        select * from sd.product where ${productName}=#{productNameValue} and id != #{id}
+    </select>
+
     <select id="getPageTotal" >
         select
             CEILING(count(a.id)/#{pageSize})

--
Gitblit v1.8.0