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
2024-12-10 19:15:28 +08:00
parent 427a38eba4
commit 5843a4a2c8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,13 +69,13 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc
{
deviceCodes = db.Queryable<DeviceGroupRelationshipEntity>().Where(x => myDeviceGroupCodes.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToList();
}
if (deviceGroupCodeProperty != null)
{
dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
}
}
if (deviceGroupCodeProperty != null)
{
dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
}
if (deviceCodeProperty != null)
{
var currentDeviceCodes = userDataPermissions.Where(x => x.UniqueType == DeviceAssignmentTypeEnumType.Device).Select(x => x.UniqueValue).ToList();

4
Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs
View File

@@ -1,4 +1,5 @@
using Dlhis.Entity.Device.Enums;
using Dlhis.DataPermission.Model;
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar;
@@ -27,6 +28,7 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
/// <summary>
/// 设备组code
/// </summary>
[DeviceGroupCode]
[SugarColumn(ColumnDescription = "设备组code")]
public Guid Code { get; set; }