From 4d165a341b6a9f0725b8c3f229496053c191abad Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 14 Jun 2022 09:42:00 +0800
Subject: [PATCH] 农资库存管理

---
 src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
index fe8eca5..86a6a91 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -42,11 +42,17 @@
         LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
         LEFT JOIN (SELECT dict_key, dict_value
         FROM blade_dict_biz
-        WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_val1
+        WHERE CODE = 'stockSpecs1' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldr.codes}
+    </if>) d ON d.dict_key = st.specs_val1
         LEFT JOIN (SELECT dict_key, dict_value
         FROM blade_dict_biz
-        WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_val2
-        LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON
+        WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldr.codes}
+    </if>) c ON c.dict_key = st.specs_val2
+        LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0  <if test="soldr.codes!=null and soldr.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldr.codes}
+    </if>) a ON
         a.dict_key = stf.type
         WHERE st.is_deleted = 0
         <if test="soldr.stype!=null and soldr.stype != ''">

--
Gitblit v1.9.3