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:
Kurris
2024-12-15 20:49:12 +08:00
parent d3dbff9248
commit f7b28440b7
9 changed files with 94 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
View File

@@ -75,7 +75,7 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc
{
dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
}
if (deviceCodeProperty != null)
{
var currentDeviceCodes = userDataPermissions.Where(x => x.UniqueType == DeviceAssignmentTypeEnumType.Device).Select(x => x.UniqueValue).ToList();
@@ -88,13 +88,13 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc
}
}
public interface IMyDataPermissionService : IScopeDependency
public interface IDataPermissionService : IScopeDependency
{
(bool, List<Guid>) GetMyDeviceCodes();
(bool, List<Guid>) GetMyDeviceGroupCodes();
}
public class MyDataPermissionService : IMyDataPermissionService
public class MyDataPermissionService : IDataPermissionService
{
private readonly IGetDataPermissions _getDataPermissions;
private readonly ICurrentUser _currentUser;
@@ -110,13 +110,14 @@ public class MyDataPermissionService : IMyDataPermissionService
{
var codes = new List<Guid>();
var disableFilter = _currentUser.GetRole() is "admin" or "tenant-admin";
if (!disableFilter)
var hasAllPermission = _currentUser.GetRole() is "admin" or "tenant-admin";
if (!hasAllPermission)
{
codes = _getDataPermissions.GetData<DeviceEntity>().FirstOrDefault().Value ?? new List<Guid>();
}
return (!disableFilter, codes);
return (!hasAllPermission, codes);
}
/// <inheritdoc />