Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 8ad473d0e87886501a73cc408ebe7efbff25f373

 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>