From 39b565ab0ea5e98a2bb0eb5c78b3c23247dbc2fe Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 七月 2024 15:22:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
index 4911316..1c3214b 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
@@ -20,6 +20,10 @@
         limit #{offset},#{pageSize};
     </select>
 
+    <select id="getSelectMaterialStoreById">
+        select * from mm.material_store m where id=#{id}
+    </select>
+
     <select id="getSelectMaterialStorePageTotal">
         select
         CEILING(count(id)/#{pageSize}) as 'pageTotal',
@@ -30,7 +34,9 @@
             <if test="materialStore.id != null and materialStore.id != ''">
                 and m.id regexp #{materialStore.id}
             </if>
-
+            <if test="materialStore.type != null and materialStore.type != ''">
+                and m.type regexp #{materialStore.type}
+            </if>
         </where>
         limit #{offset},#{pageSize};
     </select>

--
Gitblit v1.8.0