From 2768dfe68de91e08e2b380890774a92dd7a5b6a6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 20:23:44 +0800
Subject: [PATCH] 地块筛选is_deleted = 0的
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..9956a6f 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -205,7 +205,7 @@
<!--查询统计地块是否有轮廓-->
<select id="getLandIsAreaStatistic" resultType="java.lang.Integer">
- SELECT count(*) FROM sys_land where land_range is not null
+ SELECT count(*) FROM sys_land where land_range is not null AND sys_land.is_deleted = 0
<if test="land.farmId!= null and land.farmId!=''">
and farm_id=#{land.farmId}
</if>
@@ -213,7 +213,7 @@
and dept_id=#{land.deptId}
</if>
union all
- SELECT count(*) FROM sys_land where land_range is null
+ SELECT count(*) FROM sys_land where land_range is null AND sys_land.is_deleted = 0
<if test="land.farmId!= null and land.farmId!=''">
and farm_id=#{land.farmId}
</if>
@@ -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