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

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

@@ -437,7 +437,7 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @GetMapping("/admin/customer/recommend/drift")
+    @GetMapping("/admin/customer/recommend/")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,

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

@@ -226,27 +226,28 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 获取访问记录
         List<Map<String, Object>> visitors = taUvMapper.getLastVisitors(CommConstant.FAVOR_CONSULTANT, person.getPersonId(), 10);
 
+        TaUser user = taUserService.getById(person.getUserId());
         // 获取关联项目
-        List<TaPersonBuilding> buildingList = getPersonBuildings(person.getPersonId());
+        List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
         List<String> buildings = new ArrayList<>();
         if (null != buildingList && buildingList.size() > 0) {
             for(TaPersonBuilding b: buildingList) {
                 buildings.add(b.getBuildingId());
             }
         }
-        TaUser user = taUserService.getById(person.getUserId());
+
         Map<String, Object> result = new HashMap<>();
         result.put("id", person.getPersonId());
         result.put("name", user.getUserName());
         result.put("company", user.getOrgName());
         result.put("department", user.getDepartment());
-        result.put("picture", user.getAvatar());
+        result.put("picture", person.getPhoto());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());
         result.put("post", person.getPost());
         result.put("phone", person.getTel());
-        result.put("avatar", person.getAvatarurl());
+        result.put("avatar",user.getAvatar());
         result.put("visitors", visitors);
         result.put("liked", false);
         result.put("unReadNum", 0);
@@ -616,9 +617,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getPersonByOpenId(openid);
     }
 
-    public List<TaPersonBuilding> getPersonBuildings(String personId) {
+    public List<TaPersonBuilding> getPersonBuildings(String userId) {
         QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("user_id", userId);
         return taPersonBuildingMapper.selectList(queryWrapper);
     }
 
@@ -662,7 +663,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Override
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNull("person_type");
+        queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         if(building.equals("") && null != building){
             queryWrapper.eq("building_id",building);
         }