From 1d98074869643dcf23b40d99e0f24b6048fc6ff0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 29 Jun 2022 08:27:12 +0800
Subject: [PATCH] 地块管理

---
 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index b7e18f8..cb95225 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -4,10 +4,21 @@
 
     <!--自定义查询农场养殖记录分页数据-->
     <select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
-        select * from sys_traceability
+        select st.* from sys_traceability st
+        left join sys_recovery sr on st.recovery_id = sr.id
         where 1=1
         <if test="traceability.code!=null and traceability.code!=''">
-            and code = #{traceability.code}
+            and st.code = #{traceability.code}
         </if>
+        <if test="traceability.deptId!=null and traceability.deptId!=''">
+            and st.dept_id = #{traceability.deptId}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and st.tenant_id = #{traceability.tenantId}
+        </if>
+    </select>
+
+    <select id="selectRevorid" resultType="java.lang.String">
+        select recovery_id from sys_traceability where code=#{code}
     </select>
 </mapper>

--
Gitblit v1.9.3