Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -204,12 +204,13 @@ public class MiniAppController extends BaseController {
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+            // 所有人员都返回 org yansen 2019-11-13 19:56:18
+//            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
                 orgQueryWrapper.eq("org_id",taPerson.getOrgId());
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
                 taPerson.setOrg(org);
-            }
+//            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -31,7 +31,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
     @Override
     public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
         List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
-        return null;
+        return tdCityList;
     }
 
 }

src/main/resources/mapper/TdCityMapper.xml

@@ -24,15 +24,22 @@ ORDER BY
     <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
 
         SELECT
-                    oc.city_id AS id,
-                    oc.`name` AS name,
+                    c.id,
+                    c.name,
+                    c.parentid,
+                    c.shortname,
+                    c.leveltype,
+                    c.citycode,
+                    c.zipcode,
+                    c.lng,
+                    c.lat,
+                    c.pinyin,
                     oc.org_id,
                     oc.`status`,
-                    oc.parentid,
-                LEFT (c.pinyin, 1) AS initial
+                    LEFT (c.pinyin, 1) AS initial
                 FROM
                 ta_org_city oc
-                LEFT JOIN td_city c ON oc.city_id = c.id
+                INNER JOIN td_city c ON oc.city_id = c.id
                 WHERE
                 oc.org_id = #{orgId}
                 and  oc.parentid  !=100000