From 6bb092445687eece46ac0f0fbf1e053adc39689e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 17 Aug 2022 11:37:23 +0800
Subject: [PATCH] 采收时进行地块筛选
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 3f13f7b..76b5872 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -235,9 +235,15 @@
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}
- <if test="farmId !=null and farmId != '' ">
- AND land.farm_id = #{farmId}
+ WHERE land.is_deleted = 0
+ <if test="land.strainId !=null and land.strainId !=''">
+ AND sfp.strain_id = #{land.strainId}
+ </if>
+ <if test="land.farmId !=null and land.farmId != '' ">
+ AND land.farm_id = #{land.farmId}
+ </if>
+ <if test="land.sfpStatus !=null and land.sfpStatus !=''">
+ AND sfp.status = #{land.sfpStatus}
</if>
</select>
--
Gitblit v1.9.3