From 3c18ab6cd51082eefdc1e3ef28751dd46db3faab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 01 Jul 2022 10:22:18 +0800
Subject: [PATCH] 采收修改，农事记录设置租户id,溯源信息返回为二维码图片
---
src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
similarity index 78%
rename from src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
rename to src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index d226dd9..8e5ed4c 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -5,11 +5,11 @@
<!--自定义查询农场检测报告/证书分页数据-->
<select id="selectFarmPaperPage" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
select * from sys_farm_paper where 1=1
- <if test="farmPaper.type!=null">
+ <if test="farmPaper.type!=null and farmPaper.type!=''">
and type = #{farmPaper.type}
</if>
- <if test="farmPaper.farmId!=null">
- and farm_id = #{farmPaper.farmId}
+ <if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
+ and dept_id = #{farmPaper.deptId}
</if>
<if test="farmPaper.name!=null and farmPaper.name!=''">
and name like concat('%',#{farmPaper.name},'%')
--
Gitblit v1.9.3