|
@@ -127,8 +127,13 @@ public class UserController extends AppBaseController {
|
|
|
if (user.getPhone()!=null&&user.getPhone().length()>11&&!user.getPhone().matches("\\d+")){
|
|
if (user.getPhone()!=null&&user.getPhone().length()>11&&!user.getPhone().matches("\\d+")){
|
|
|
user.setPhone(decryptPhoneMk(user.getPhone()));
|
|
user.setPhone(decryptPhoneMk(user.getPhone()));
|
|
|
}
|
|
}
|
|
|
- CompanyUser companyUser = companyUserService.getInviteCodeByCompanyUserIdAndUserId(user.getInvitedBySalesId());
|
|
|
|
|
- companyUser.setInvitationName(StringUtils.isNotEmpty(companyUser.getNickName())?companyUser.getNickName():"");
|
|
|
|
|
|
|
+ CompanyUser companyUser =new CompanyUser();
|
|
|
|
|
+ if(user.getInvitedBySalesId()!=null){
|
|
|
|
|
+ companyUser = companyUserService.getInviteCodeByCompanyUserIdAndUserId(user.getInvitedBySalesId());
|
|
|
|
|
+ if(companyUser!=null){
|
|
|
|
|
+ companyUser.setInvitationName(StringUtils.isNotEmpty(companyUser.getNickName())?companyUser.getNickName():"");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
map.put("user",user);
|
|
map.put("user",user);
|
|
|
map.put("inviteInfo",companyUser);
|
|
map.put("inviteInfo",companyUser);
|