张延森 5 年之前
父節點
當前提交
f7b7e229d0

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

204
 
204
 
205
             // 获取其余信息
205
             // 获取其余信息
206
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
206
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
207
-            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
207
+            // 所有人员都返回 org yansen 2019-11-13 19:56:18
208
+//            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
208
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
209
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
209
                 orgQueryWrapper.eq("org_id",taPerson.getOrgId());
210
                 orgQueryWrapper.eq("org_id",taPerson.getOrgId());
210
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
211
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
211
                 taPerson.setOrg(org);
212
                 taPerson.setOrg(org);
212
-            }
213
+//            }
213
             Map<String, Object> result = new HashMap<>();
214
             Map<String, Object> result = new HashMap<>();
214
             result.put("miniApp", miniResp);
215
             result.put("miniApp", miniResp);
215
             result.put("person", taPerson);
216
             result.put("person", taPerson);

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java 查看文件

31
     @Override
31
     @Override
32
     public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
32
     public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
33
         List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
33
         List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
34
-        return null;
34
+        return tdCityList;
35
     }
35
     }
36
 
36
 
37
 }
37
 }

+ 12
- 5
src/main/resources/mapper/TdCityMapper.xml 查看文件

24
     <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
24
     <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
25
 
25
 
26
         SELECT
26
         SELECT
27
-                    oc.city_id AS id,
28
-                    oc.`name` AS name,
27
+                    c.id,
28
+                    c.name,
29
+                    c.parentid,
30
+                    c.shortname,
31
+                    c.leveltype,
32
+                    c.citycode,
33
+                    c.zipcode,
34
+                    c.lng,
35
+                    c.lat,
36
+                    c.pinyin,
29
                     oc.org_id,
37
                     oc.org_id,
30
                     oc.`status`,
38
                     oc.`status`,
31
-                    oc.parentid,
32
-                LEFT (c.pinyin, 1) AS initial
39
+                    LEFT (c.pinyin, 1) AS initial
33
                 FROM
40
                 FROM
34
                 ta_org_city oc
41
                 ta_org_city oc
35
-                LEFT JOIN td_city c ON oc.city_id = c.id
42
+                INNER JOIN td_city c ON oc.city_id = c.id
36
                 WHERE
43
                 WHERE
37
                 oc.org_id = #{orgId}
44
                 oc.org_id = #{orgId}
38
                 and  oc.parentid  !=100000
45
                 and  oc.parentid  !=100000