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

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

@@ -159,7 +159,7 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
         queryWrapper.eq("org_id",orgId);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
@@ -575,7 +575,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
-            person.setPhone(phone);
+//            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);