From e7f5c0e502a89b2f91c4b57f42c56d7eb2484563 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:25 +0800
Subject: [PATCH] 增加农场筛选条件
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 60b340c..4ea9aba 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -11,6 +11,7 @@
slogan,
introduce,
picture,
+ panoramic,
ST_ASTEXT(position) as position
from
sys_farm
@@ -41,6 +42,12 @@
</if>
<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>
@@ -101,9 +108,10 @@
<!--农场数量-->
<select id="selectCountFarm" resultType="java.lang.Integer">
- SELECT COUNT(*) as count
- FROM `blade_dept`
- WHERE tenant_id='000000' AND is_deleted=0 AND parent_id!=0
+ SELECT
+ COUNT( * ) AS count
+ FROM
+ sys_farm
</select>
<!--人员数量-->
--
Gitblit v1.9.3