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

fix 手动添加isDeleted

Browse Source
This commit is contained in:
liguoyang
2025-04-02 15:01:09 +08:00
parent cbe0c583b4
commit 2c67fda9a6
7 changed files with 23 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs
View File

@@ -96,15 +96,23 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
var enableFactoryPermissions = await _dbContext.Queryable<FactorySettingEntity>().ToListAsync();
var gainfoGroupRelationships = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => userNos.Contains(x.UserNo)).ToListAsync();
var gainfoGroupRelationships = await _dbContext.Queryable<GainfoGroupRelationshipEntity>()
.Where(x => x.IsDeleted == false)
.Where(x => userNos.Contains(x.UserNo))
.ToListAsync();
var gainfoGroups = await _dbContext.Queryable<GainfoGroupEntity>().ToListAsync();
var devicePermissions = await _dbContext.Queryable<DevicePermissionEntity>()
.Where(x => x.IsDeleted == false)
.Select<DevicePermissionDto>()
.ToListAsync();
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
var deviceRelationships = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().ToListAsync();
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>()
.Where(x => x.IsDeleted == false)
.ToListAsync();
var deviceRelationships = await _dbContext.Queryable<DeviceGroupRelationshipEntity>()
.Where(x => x.IsDeleted == false)
.ToListAsync();
var departments = await _dbContext.Queryable<DepartmentEntity>().ToListAsync();
var result = new ConcurrentDictionary<string, List<TenantAssignTypeDeviceCode>>();