From 0ef5931c06034908b346187c849acdcf413953c2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 10:45:40 +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 5fad38d..131a9f7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -57,6 +57,9 @@
<if test="land.tenantId!=null and land.tenantId != ''">
and l.tenant_id =#{land.tenantId}
</if>
+ <if test="land.farmId !=null and land.farmId !=''">
+ AND l.farm_id = #{land.farmId}
+ </if>
</select>
<!--查询地块列表（不分页）-->
--
Gitblit v1.9.3