From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
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