From 1cce11b88af89659289d978ea5a934c53fb41207 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 08 Jul 2022 10:14:58 +0800
Subject: [PATCH] 农场修改，新增，检测证书查询修改
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 2 +-
src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
index 7d178da..98d3028 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -45,7 +45,7 @@
ST_GeomFromText(${farm.position}),
</when>
<otherwise>
- '',
+ null,
</otherwise>
</choose>
#{farm.createTime},#{farm.updateTime},#{farm.deptId})
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index ba6efbd..0bd83c7 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -11,6 +11,9 @@
<if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
and dept_id = #{farmPaper.deptId}
</if>
+ <if test="farmPaper.farmId!=null">
+ and farm_id = #{farmPaper.farmId}
+ </if>
<if test="farmPaper.name!=null and farmPaper.name!=''">
and name like concat('%',#{farmPaper.name},'%')
</if>
--
Gitblit v1.9.3