From 9781c2318d35f761de83fffe20f66e099d00988e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 Jun 2019 14:07:08 +0800
Subject: [PATCH] 加入单位

---
 src/main/resources/mapper/MonitorPointMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index d1cbef7..dadb0c4 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -88,7 +88,7 @@
 			</if>
 		)
 	</select>
-	<select id="getMonitorPointsByAreaName" resultType="com.moral.entity.MonitorPoint">
+	<select id="getMonitorPointsByAreaName" resultMap="BaseResultMap">
 		SELECT
 			mp.* 
 		FROM
@@ -109,7 +109,15 @@
 		SELECT mpt.* from monitor_point mpt
 		<where>
 			<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
-				mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+				(
+				1 > 1
+					<if test="orgIds!=null and orgIds.size() > 0">
+						or mpt.organization_id in
+						<foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
+							#{tempOrgId,jdbcType=INTEGER}
+						</foreach>
+					</if>
+				)
 			</if>
 			<![CDATA[
 			AND mpt.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
@@ -117,6 +125,10 @@
             AND mpt.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
             AND mpt.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
      		 ]]>
+     		<if test="regionCode != null">
+     		AND mpt.${regionType}_code = #{regionCode}
+     		</if>
+     		 
 			<if test="isDelete != null">
 			AND	mpt.is_delete = #{isDelete,jdbcType=VARCHAR}
 			</if>

--
Gitblit v1.8.0