diff --git a/Src/Dlhis.Basic/Device/Dtos/TenantAssignTypeDeviceCode.cs b/Src/Dlhis.Basic/Device/Dtos/TenantAssignTypeDeviceCode.cs index 6e6632dc..7079febe 100644 --- a/Src/Dlhis.Basic/Device/Dtos/TenantAssignTypeDeviceCode.cs +++ b/Src/Dlhis.Basic/Device/Dtos/TenantAssignTypeDeviceCode.cs @@ -15,7 +15,7 @@ public class TenantAssignTypeDeviceCode /// /// 设备权限 /// - public IEnumerable AssignTypes { get; init; } + public List AssignTypes { get; init; } } public class AssignTypeDeviceCode @@ -35,10 +35,10 @@ public class AssignTypeDeviceCode /// /// 权限 /// - public IEnumerable Codes { get; set; } + public List Codes { get; set; } - public IEnumerable OriginalCodes { get; set; } + public List OriginalCodes { get; set; } } public class UserTenantDeviceCodeDto diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs index 138bf32d..57caf78e 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs @@ -248,9 +248,9 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService AssignType = p.Key.AssignType, AssignValue = p.Key.AssignValue, UniqueType = p.Key.UniqueType, - Codes = p.SelectMany(xx => xx.Codes), - OriginalCodes = p.Where(xx => xx.OriginalCodes.IsPresent()).SelectMany(xx => xx.OriginalCodes) - }) + Codes = p.SelectMany(xx => xx.Codes).ToList(), + OriginalCodes = p.Where(xx => xx.OriginalCodes.IsPresent()).SelectMany(xx => xx.OriginalCodes).ToList() + }).ToList() }; return dto; @@ -299,8 +299,8 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService AssignType = xx.Key.AssignType, AssignValue = xx.Key.AssignValue, UniqueType = uniqueType, - Codes = xx.Select(xxx => xxx.UniqueValue) - }) + Codes = xx.Select(xxx => xxx.UniqueValue).ToList() + }).ToList() }) .ToList(); @@ -318,7 +318,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService nextItems = nextItems.Distinct().ToList(); assignTypeDeviceCodeItem.OriginalCodes = nextItems; - assignTypeDeviceCodeItem.Codes = deviceGroupRelationships.Where(x => nextItems.Contains(x.GroupCode)).Select(x => x.DeviceCode); + assignTypeDeviceCodeItem.Codes = deviceGroupRelationships.Where(x => nextItems.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToList(); } } }