Browse Source

user person

胡轶钦 5 years ago
parent
commit
ca2efedde8

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java View File

437
         return responseBean;
437
         return responseBean;
438
     }
438
     }
439
 
439
 
440
-    @GetMapping("/admin/customer/recommend/drift")
440
+    @GetMapping("/admin/customer/recommend/")
441
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
441
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
442
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
442
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
443
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
443
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,

+ 8
- 7
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java View File

226
         // 获取访问记录
226
         // 获取访问记录
227
         List<Map<String, Object>> visitors = taUvMapper.getLastVisitors(CommConstant.FAVOR_CONSULTANT, person.getPersonId(), 10);
227
         List<Map<String, Object>> visitors = taUvMapper.getLastVisitors(CommConstant.FAVOR_CONSULTANT, person.getPersonId(), 10);
228
 
228
 
229
+        TaUser user = taUserService.getById(person.getUserId());
229
         // 获取关联项目
230
         // 获取关联项目
230
-        List<TaPersonBuilding> buildingList = getPersonBuildings(person.getPersonId());
231
+        List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
231
         List<String> buildings = new ArrayList<>();
232
         List<String> buildings = new ArrayList<>();
232
         if (null != buildingList && buildingList.size() > 0) {
233
         if (null != buildingList && buildingList.size() > 0) {
233
             for(TaPersonBuilding b: buildingList) {
234
             for(TaPersonBuilding b: buildingList) {
234
                 buildings.add(b.getBuildingId());
235
                 buildings.add(b.getBuildingId());
235
             }
236
             }
236
         }
237
         }
237
-        TaUser user = taUserService.getById(person.getUserId());
238
+
238
         Map<String, Object> result = new HashMap<>();
239
         Map<String, Object> result = new HashMap<>();
239
         result.put("id", person.getPersonId());
240
         result.put("id", person.getPersonId());
240
         result.put("name", user.getUserName());
241
         result.put("name", user.getUserName());
241
         result.put("company", user.getOrgName());
242
         result.put("company", user.getOrgName());
242
         result.put("department", user.getDepartment());
243
         result.put("department", user.getDepartment());
243
-        result.put("picture", user.getAvatar());
244
+        result.put("picture", person.getPhoto());
244
         result.put("hotNum", person.getHotNum());
245
         result.put("hotNum", person.getHotNum());
245
         result.put("likeNum", person.getLikeNum());
246
         result.put("likeNum", person.getLikeNum());
246
         result.put("pvNum", person.getPvNum());
247
         result.put("pvNum", person.getPvNum());
247
         result.put("post", person.getPost());
248
         result.put("post", person.getPost());
248
         result.put("phone", person.getTel());
249
         result.put("phone", person.getTel());
249
-        result.put("avatar", person.getAvatarurl());
250
+        result.put("avatar",user.getAvatar());
250
         result.put("visitors", visitors);
251
         result.put("visitors", visitors);
251
         result.put("liked", false);
252
         result.put("liked", false);
252
         result.put("unReadNum", 0);
253
         result.put("unReadNum", 0);
616
         return taPersonMapper.getPersonByOpenId(openid);
617
         return taPersonMapper.getPersonByOpenId(openid);
617
     }
618
     }
618
 
619
 
619
-    public List<TaPersonBuilding> getPersonBuildings(String personId) {
620
+    public List<TaPersonBuilding> getPersonBuildings(String userId) {
620
         QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
621
         QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
621
-        queryWrapper.eq("person_id", personId);
622
+        queryWrapper.eq("user_id", userId);
622
         return taPersonBuildingMapper.selectList(queryWrapper);
623
         return taPersonBuildingMapper.selectList(queryWrapper);
623
     }
624
     }
624
 
625
 
662
     @Override
663
     @Override
663
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
664
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
664
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
665
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
665
-        queryWrapper.isNull("person_type");
666
+        queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
666
         if(building.equals("") && null != building){
667
         if(building.equals("") && null != building){
667
             queryWrapper.eq("building_id",building);
668
             queryWrapper.eq("building_id",building);
668
         }
669
         }