From 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jul 2022 15:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 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 2fbeef9..37856e6 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -22,6 +22,7 @@
<select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
select st.* from sys_traceability st
left join sys_recovery sr on st.recovery_id = sr.id
+ left join sys_land sl on sr.land_id = sl.id
where 1=1
<if test="traceability.code!=null and traceability.code!=''">
and st.code like concat('%',#{traceability.code},'%')
@@ -32,6 +33,9 @@
<if test="traceability.tenantId!=null and traceability.tenantId!=''">
and st.tenant_id = #{traceability.tenantId}
</if>
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and sl.farm_id = #{traceability.farmId}
+ </if>
</select>
<select id="selectRevorid" resultType="java.lang.String">
--
Gitblit v1.9.3