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/lang/mapper/LandMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 482ea63..3a83ae7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -81,6 +81,9 @@
         <if test="land.tenantId!=null and land.tenantId != ''">
             and tenant_id =#{land.tenantId}
         </if>
+        <if test="land.farmId!=null and land.farmId != ''">
+            and farm_id =#{land.farmId}
+        </if>
     </select>
 
     <insert id="saveLandInfo">

--
Gitblit v1.9.3