From 004bea4396372a9495171c4a02fd652a1c68a3bf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 08:57:34 +0800
Subject: [PATCH] 修复当landType为0时，判定为空因此不执行sql语句的问题
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 6 +++---
1 files changed, 3 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 76b5872..14e002b 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -42,7 +42,7 @@
</if> ) c ON c.dict_key = l.land_unit
LEFT JOIN ( SELECT id, farm_name FROM sys_farm ) v ON v.id = l.farm_id
where l.is_deleted = 0
- <if test="land.landType!=null and land.landType != ''">
+ <if test="land.landType!=null and land.landType != '' or land.landType == 0 ">
and l.land_type = #{land.landType}
</if>
<if test="land.landName!=null and land.landName != ''">
@@ -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>
--
Gitblit v1.9.3