From e7f5c0e502a89b2f91c4b57f42c56d7eb2484563 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:25 +0800
Subject: [PATCH] 增加农场筛选条件
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 fc1ed16..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>
<!--查询地块列表（不分页）-->
@@ -229,7 +232,7 @@
</if>
</select>
<select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
- SELECT land.id,land.land_name,land.url,land.farm_id
+ SELECT DISTINCT land.id,land.land_name,land.url,land.farm_id
FROM sys_land land
LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
WHERE sfp.strain_id = #{strainId}
--
Gitblit v1.9.3