From 7f086cb5da9ca65ec4be6b77bf260ea72a9033d9 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 11 Apr 2025 20:43:17 +0800
Subject: [PATCH] fix issoftdelete

---
 .../Device/Services/Implements/DevicePermissionService.cs       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 7bccc030..552160e8 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -355,12 +355,14 @@ public class DevicePermissionService : IDevicePermissionService
         //当前设备的分组
         var groups = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
             .Where(x => x.DeviceCode == device.Code)
+            .Where(x => x.IsDeleted == false)
             .Select(x => x.GroupCode)
             .ToListAsync();
 
         var permissions = await _dbContext.Queryable<DevicePermissionEntity>()
             .Where(x => (x.UniqueType == DeviceAssignmentTypeEnumType.Device && x.UniqueValue == device.Code)
                         || (x.UniqueType == DeviceAssignmentTypeEnumType.Group && groups.Contains(x.UniqueValue)))
+            .Where(x => x.IsDeleted == false)
             .ToListAsync();
 
         var ids = new List<long>();