yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issoftdelete

Browse Source
This commit is contained in:
liguoyang
2025-04-11 20:43:17 +08:00
parent f4ebc36aa5
commit 7f086cb5da
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -355,12 +355,14 @@ public class DevicePermissionService : IDevicePermissionService
//当前设备的分组 //当前设备的分组
var groups = await _dbContext.Queryable<DeviceGroupRelationshipEntity>() var groups = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
.Where(x => x.DeviceCode == device.Code) .Where(x => x.DeviceCode == device.Code)
.Where(x => x.IsDeleted == false)
.Select(x => x.GroupCode) .Select(x => x.GroupCode)
.ToListAsync(); .ToListAsync();
var permissions = await _dbContext.Queryable<DevicePermissionEntity>() var permissions = await _dbContext.Queryable<DevicePermissionEntity>()
.Where(x => (x.UniqueType == DeviceAssignmentTypeEnumType.Device && x.UniqueValue == device.Code) .Where(x => (x.UniqueType == DeviceAssignmentTypeEnumType.Device && x.UniqueValue == device.Code)
|| (x.UniqueType == DeviceAssignmentTypeEnumType.Group && groups.Contains(x.UniqueValue))) || (x.UniqueType == DeviceAssignmentTypeEnumType.Group && groups.Contains(x.UniqueValue)))
.Where(x => x.IsDeleted == false)
.ToListAsync(); .ToListAsync();
var ids = new List<long>(); var ids = new List<long>();