From 8ad473d0e87886501a73cc408ebe7efbff25f373 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:16:01 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
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