From 930adc902c0d0a81b685e7d3f0443df50cb608a0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 05 Jan 2018 15:52:02 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/resources/mapper/MonitorPointMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 33258a0..b434327 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -6,9 +6,16 @@
mp.*
FROM
monitor_point mp,
- area a
+ area a
+ <if test="cityName != null">
+ ,city c
+ </if>
WHERE
mp.area_code = a.area_code
- AND a.area_name = #{areaName}
+ AND a.area_name = #{areaName}
+ <if test="cityName != null">
+ AND c.city_name = #{cityName}
+ AND mp.city_code = c.city_code
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0