Commit ba92ea27 authored by 李健华's avatar 李健华

去掉租户隔离校验

parent 8a155c92
...@@ -456,22 +456,22 @@ public class UserController implements IBaseController { ...@@ -456,22 +456,22 @@ 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();
Integer sessionTenantId = sessionStruct.getValues().getLoginProperties().getTenantId(); // Integer sessionTenantId = sessionStruct.getValues().getLoginProperties().getTenantId();
//默认羊小咩租户 // //默认羊小咩租户
if (TenantUtil.validationTenantIdIsNullOrZero(sessionTenantId)) { // if (TenantUtil.validationTenantIdIsNullOrZero(sessionTenantId)) {
sessionTenantId = TenantUtil.TENANT_DEFAULT; // sessionTenantId = TenantUtil.TENANT_DEFAULT;
} // }
//校验非羊小咩租户 //校验非羊小咩租户
if (!sessionTenantId.equals(TenantUtil.TENANT_DEFAULT)) { // if (!sessionTenantId.equals(TenantUtil.TENANT_DEFAULT)) {
if (sessionTenantId.equals(tenantId)) { // if (sessionTenantId.equals(tenantId)) {
user = tenantService.getTenantUser(user, tenantId); // user = tenantService.getTenantUser(user, tenantId);
if (user == null) { // if (user == null) {
return JsonResult.buildSuccessResult(null, result); // return JsonResult.buildSuccessResult(null, result);
} // }
}else { // }else {
return JsonResult.buildSuccessResult(null, result); // return JsonResult.buildSuccessResult(null, result);
} // }
} // }
String phoneNo = user.getPhoneNo(); String phoneNo = user.getPhoneNo();
result.put("phoneNo", phoneNo); result.put("phoneNo", phoneNo);
result.put("userId", user.getId()); result.put("userId", user.getId());
......
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