From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块

---
 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index a113764..dee7705 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -80,12 +80,18 @@
         LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
         LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1
         WHERE st.is_deleted = 0
+        <if test="stockrecord.agrname!=null and stockrecord.agrname != ''">
+            and f.agricultural_name like concat ('%',#{stockrecord.agrname},'%')
+        </if>
         <if test="stockrecord.stype!=null and stockrecord.stype != ''">
             and stf.type = #{stockrecord.stype}
         </if>
         <if test="stockrecord.sid!=null and stockrecord.sid != ''">
             and st.sid = #{stockrecord.sid}
         </if>
+        <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
+            and st.dept_id = #{stockrecord.deptId}
+        </if>
         ORDER BY st.create_time desc
     </select>
 

--
Gitblit v1.9.3