From f38b9b10de303806a8d27734dbbf0ff8815dba49 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 08 三月 2024 19:37:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/BasicData.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/BasicData.xml b/north-glass-erp/src/main/resources/mapper/sd/BasicData.xml
index 78f29a0..1ff0a96 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BasicData.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BasicData.xml
@@ -8,14 +8,22 @@
             *
         from
             basic_data as a
-        where a.basic_type='order'
+        where a.basic_type=#{type}
     </select>
+    <select id="getOrderBasicDataByTypeAndChildType">
+        select
+            *
+        from
+            basic_data as a
+        where a.basic_type=#{type} and a.basic_category = #{childType}
+    </select>
+
     <select id="getOrderBasicDataType">
         select
             a.basic_category
         from
             basic_data as a
-        where a.basic_type='order'
+        where a.basic_type=#{type}
         group by  a.basic_category
 
     </select>

--
Gitblit v1.8.0