From cbf9a496a93ec22643381848471a07240dbc231b Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 11 Dec 2024 16:05:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=95=E7=94=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Dtos/TenantAssignTypeDeviceCode.cs        |  6 +++---
 .../Implements/DevicePermissionAnalyzeService.cs     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

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
     /// <summary>
     /// 设备权限
     /// </summary>
-    public IEnumerable<AssignTypeDeviceCode> AssignTypes { get; init; }
+    public List<AssignTypeDeviceCode> AssignTypes { get; init; }
 }
 
 public class AssignTypeDeviceCode
@@ -35,10 +35,10 @@ public class AssignTypeDeviceCode
     /// <summary>
     /// 权限
     /// </summary>
-    public IEnumerable<Guid> Codes { get; set; }
+    public List<Guid> Codes { get; set; }
 
 
-    public IEnumerable<Guid> OriginalCodes { get; set; }
+    public List<Guid> 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();
                 }
             }
         }