gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '🍒 fix(Auth): 修复Mysql不支持FullJoin语句的问题，优化本部门及以下机构查询逻辑' (#442) from jasondom/Admin.NET.Pro:v2 into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/442
This commit is contained in:
zuohuaijun 2025-09-03 19:30:41 +08:00
commit 5b1034da97
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -609,9 +609,9 @@ public class SysAuthService : IDynamicApiController, ITransient
// 获取用户角色关联的机构Id
db.Queryable<SysRoleOrg>().InnerJoin<SysUserRole>((u, a) => u.RoleId == a.RoleId).Select((u, a) => new { a.UserId, u.OrgId }),
// 获取包含全部数据权限的机构Id
db.Queryable<SysOrg>().IgnoreTenant().FullJoin<SysUserRole>((u, a) => a.SysRole.DataScope == DataScopeEnum.All).Select((u, a) => new { a.UserId, OrgId = u.Id }),
db.Queryable<SysOrg>().IgnoreTenant().Where(u => SqlFunc.Subqueryable<SysUserRole>().InnerJoin<SysRole>((x, y) => x.RoleId == y.Id).Where((x, y) => x.UserId == user.Id && y.DataScope == DataScopeEnum.All).Any()).Select(u => new { UserId = user.Id, OrgId = u.Id }),
// 超管获取全部机构Id
db.Queryable<SysOrg>().IgnoreTenant().FullJoin<SysUser>((u, a) => a.AccountType == AccountTypeEnum.SuperAdmin).Select((u, a) => new { UserId = a.Id, OrgId = u.Id }))
db.Queryable<SysOrg>().IgnoreTenant().Where(u => user.AccountType == AccountTypeEnum.SuperAdmin).Select(u => new { UserId = user.Id, OrgId = u.Id }))
.Where(u => SqlFunc.IsNull(u.OrgId, 0) != 0 && u.UserId == user.Id)
.Select(u => u.OrgId)
.Distinct()
@ -619,7 +619,7 @@ public class SysAuthService : IDynamicApiController, ITransient
// 如果存在本部门及以下，则获取本部门及以下机构的Id
var dataScopes = db.Queryable<SysRole>().Where(u => roleIds.Contains(u.Id)).Select(u => u.DataScope).Distinct().ToList();
if (dataScopes.Any(u => u == DataScopeEnum.DeptChild))
if (dataScopes.All(u => u != DataScopeEnum.All) && dataScopes.Any(u => u == DataScopeEnum.DeptChild))
{
var childOrg = db.Queryable<SysOrg>().IgnoreTenant().ToTree(u => u.Children, u => u.Pid, user.OrgId);
if (childOrg == null || childOrg.Count > 0) return orgIds;