Commit 78d8ef00 authored by guangjing.gao's avatar guangjing.gao

根据token查询用户信息,租户为空默认羊小咩走原流程,否则走新流程

parent dd0981d7
...@@ -459,10 +459,13 @@ public class UserController implements IBaseController { ...@@ -459,10 +459,13 @@ public class UserController implements IBaseController {
return JsonResult.buildSuccessResult(null, result); return JsonResult.buildSuccessResult(null, result);
} }
User user = sessionStruct.getValues().getUser(); User user = sessionStruct.getValues().getUser();
if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) { //校验非羊小咩租户
user = tenantService.getTenantUser(user, tenantId); if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
if (user == null) { if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
return JsonResult.buildSuccessResult(null, result); user = tenantService.getTenantUser(user, tenantId);
if (user == null) {
return JsonResult.buildSuccessResult(null, result);
}
} }
} }
String phoneNo = user.getPhoneNo(); String phoneNo = user.getPhoneNo();
......
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