From 5843a4a2c81ff58ead337f7c29eeacf686d6de02 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 10 Dec 2024 19:15:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=86=E7=BB=84=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataPermissions/GetDataPermissionService.cs | 10 +++++----- Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs b/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs index f296392e..117ec9fa 100644 --- a/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs +++ b/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs @@ -69,13 +69,13 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc { deviceCodes = db.Queryable().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(); diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs index 4b2b916f..babfb4db 100644 --- a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs +++ b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs @@ -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 /// /// 设备组code /// + [DeviceGroupCode] [SugarColumn(ColumnDescription = "设备组code")] public Guid Code { get; set; }