Commit 3e027ee0 authored by 李健华's avatar 李健华

注册用户判断无论是否新增用户添加映射

parent 88fa6bec
...@@ -309,6 +309,9 @@ public class InnerController implements IBaseController { ...@@ -309,6 +309,9 @@ public class InnerController implements IBaseController {
if (registeredFrom == null) { if (registeredFrom == null) {
registeredFrom = 0L; registeredFrom = 0L;
} }
if (tenantId == null) {
tenantId = TenantUtil.TENANT_DEFAULT;
}
User user = userService.findByPhoneWithCache(phoneNo); User user = userService.findByPhoneWithCache(phoneNo);
if (user != null) { if (user != null) {
...@@ -317,15 +320,17 @@ public class InnerController implements IBaseController { ...@@ -317,15 +320,17 @@ public class InnerController implements IBaseController {
log.info("用户已经注销,phoneNo:{}", phoneNo); log.info("用户已经注销,phoneNo:{}", phoneNo);
return JsonResult.buildErrorStateResult("用户已经注销", null); return JsonResult.buildErrorStateResult("用户已经注销", null);
} }
// 插入关联数据
iOauthLoginInfoService.addLoginInfo(user, tenantId);
//已存在用户 //已存在用户
return JsonResult.buildSuccessResult(null, new UserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
} }
//注册新用户 //注册新用户
user = userRegisterService.register(registeredFrom, phoneNo, null, null, 0L, 0L); user = userRegisterService.register(registeredFrom, phoneNo, null, null, 0L, 0L);
//校验租户ID tenantId //校验租户ID tenantId
if (tenantId != null && !tenantId.equals(0)) {
iOauthLoginInfoService.addLoginInfo(user, tenantId); iOauthLoginInfoService.addLoginInfo(user, tenantId);
}
return JsonResult.buildSuccessResult(null, new UserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment