yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 子查询补充过滤

Browse Source
This commit is contained in:
liguoyang
2025-12-17 11:04:56 +08:00
parent b409f6f375
commit 4bca8859ef
4 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -446,52 +446,53 @@ public class DevicePermissionService : IDevicePermissionService
);
break;
case AssignTypeEnumType.Group:
{
var codes = assignValues.Select(Guid.Parse);
ids.AddRange(await _dbContext.Queryable<GainfoGroupEntity>()
.LeftJoin<GainfoGroupRelationshipEntity>((a, b) => a.Code == b.GroupCode)
.LeftJoin<GainfoEntity>((a, b, c) => b.UserNo == c.No)
.Where(a => codes.Contains(a.Code))
.Select((a, b, c) => c.Id)
.ToListAsync()
);
}
{
var codes = assignValues.Select(Guid.Parse);
ids.AddRange(await _dbContext.Queryable<GainfoGroupEntity>()
.LeftJoin<GainfoGroupRelationshipEntity>((a, b) => a.Code == b.GroupCode)
.LeftJoin<GainfoEntity>((a, b, c) => b.UserNo == c.No)
.Where(a => codes.Contains(a.Code))
.Select((a, b, c) => c.Id)
.ToListAsync()
);
}
break;
case AssignTypeEnumType.Department:
{
//递归向上获取 assignValue = tenant:department
var tenantDepartments = assignValues.Select(x =>
{
var arr = x.Split(":");
var currentDepartmentNo = arr.Last();
var departmentNos = RecursionHelper.HandlerDepartmentNextCodes(currentDepartmentNo, departments);
return new
//递归向上获取 assignValue = tenant:department
var tenantDepartments = assignValues.Select(x =>
{
tenantId = arr.First(), departmentNos
};
});
var arr = x.Split(":");
var currentDepartmentNo = arr.Last();
var departmentNos = RecursionHelper.HandlerDepartmentNextCodes(currentDepartmentNo, departments);
return new
{
tenantId = arr.First(),
departmentNos
};
});
var where = LinqExpressionExtensions.False<GainfoEntity>();
foreach (var tenantDepartment in tenantDepartments)
{
where = where.Or(x => x.Factory == tenantDepartment.tenantId && tenantDepartment.departmentNos.Contains(x.DepartmentNo));
var where = LinqExpressionExtensions.False<GainfoEntity>();
foreach (var tenantDepartment in tenantDepartments)
{
where = where.Or(x => x.Factory == tenantDepartment.tenantId && tenantDepartment.departmentNos.Contains(x.DepartmentNo));
}
ids.AddRange(await _dbContext.Queryable<GainfoEntity>()
.Where(where)
.Select(x => x.Id)
.ToListAsync()
);
}
ids.AddRange(await _dbContext.Queryable<GainfoEntity>()
.Where(where)
.Select(x => x.Id)
.ToListAsync()
);
}
break;
case AssignTypeEnumType.Tenant:
{
ids.AddRange(await _dbContext.Queryable<GainfoEntity>()
.Where(x => assignValues.Contains(x.Factory))
.Select(x => x.Id)
.ToListAsync()
);
}
{
ids.AddRange(await _dbContext.Queryable<GainfoEntity>()
.Where(x => assignValues.Contains(x.Factory))
.Select(x => x.Id)
.ToListAsync()
);
}
break;
default:
throw new ArgumentOutOfRangeException($"不支持的权限类型:{assignType}");
@@ -603,8 +604,10 @@ public class DevicePermissionService : IDevicePermissionService
var devicePermissionManuallyUserNos = await _dbContext.Queryable<GainfoEntity>()
.Where(x => SqlFunc.Subqueryable<DevicePermissionManuallyEntity>()
.Where(p => p.DeviceCode == device.Code)
.Where(p => p.UserNo == x.No).Any())
.EnableTableFilter()
.Where(p => p.DeviceCode == device.Code)
.Where(p => p.UserNo == x.No)
.Any())
.Select(x => x.No)
.ToListAsync();
@@ -626,6 +629,7 @@ public class DevicePermissionService : IDevicePermissionService
// 获取与指定设备关联的分组编码
var groupCodes = await _dbContext.Queryable<DeviceGroupEntity>()
.Where(x => SqlFunc.Subqueryable<DeviceGroupRelationshipEntity>()
.EnableTableFilter()
.Where(p => p.GroupCode == x.Code)
.Where(p => p.DeviceCode == deviceCode)
.Any())
@@ -663,8 +667,10 @@ public class DevicePermissionService : IDevicePermissionService
{
return await _dbContext.Queryable<GainfoEntity>()
.Where(x => SqlFunc.Subqueryable<DevicePermissionManuallyEntity>()
.EnableTableFilter()
.Where(p => p.DeviceCode == deviceCode)
.Where(p => p.UserNo == x.No).Any())
.Where(p => p.UserNo == x.No)
.Any())
.Select(x => x.No)
.ToListAsync();
}