Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -126,7 +126,12 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     @ResultType(Map.class)
-    @Select("select city, count(1) as city_count  from ta_person where ifnull(person_type, '') != #{personType} and city is not null GROUP BY city")
+    @Select("SELECT " +
+            "b.NAME AS city," +
+            "count(a.person_id) AS city_count" +
+            " FROM" +
+            " ta_person a" +
+            " LEFT JOIN ( select t.*, s.pinyin as province from td_city t JOIN td_city s on t.parentid = s.id) b ON a.city = b.pinyin and a.province = b.province where ifnull(a.person_type, '') != #{personType} and a.city is not null GROUP BY a.city")
     List<Map<String, Object>> selectCityUser(@Param("personType") String personType);