From 0ef5931c06034908b346187c849acdcf413953c2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 10:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/farm/vo/FarmVO.java | 2 ++
2 files changed, 8 insertions(+), 0 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 3eb5c87..4ea9aba 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -43,6 +43,12 @@
<if test="farm.deptId!=null and farm.deptId!=''">
and dept_id = #{farm.deptId}
</if>
+ <if test="farm.ids!=null and farm.ids!=''">
+ and id in
+ <foreach item="id" collection="farm.ids.split(',')" open="(" separator=" , " close=")">
+ #{id}
+ </foreach>
+ </if>
</select>
<!--自定义修改农场围栏数据-->
diff --git a/src/main/java/org/springblade/modules/farm/vo/FarmVO.java b/src/main/java/org/springblade/modules/farm/vo/FarmVO.java
index 70d21eb..eda0c34 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmVO.java
@@ -15,4 +15,6 @@
public class FarmVO extends Farm {
private static final long serialVersionUID = 1L;
+ private String ids;
+
}
--
Gitblit v1.9.3