From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Mon, 17 Jun 2019 15:23:45 +0800 Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git --- src/main/resources/mapper/MonitorPointMapper.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml index 8ece846..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 @@ -125,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