fix userNos合并

This commit is contained in:
2024-02-27 12:44:48 +08:00
parent 87d7d62c20
commit da9e7db359

View File

@@ -71,7 +71,7 @@ public class DevicePermissionService : IDevicePermissionService
var nextUserNos = await GetPermissionUserNosAsync();
if (nextUserNos.Any())
{
userNos = nextUserNos;
userNos = userNos.Concat(nextUserNos).Distinct().ToList();
}
var currentDic = await GetAssignDeviceCodesInternalAsync(userNos);
@@ -79,6 +79,7 @@ public class DevicePermissionService : IDevicePermissionService
var deivces = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
foreach (var userNo in userNos)
{
beforeDic.TryGetValue(userNo, out var beforeCodes);
beforeCodes ??= new List<Guid>();
@@ -100,7 +101,6 @@ public class DevicePermissionService : IDevicePermissionService
addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList();
var userInfo = await _dbContext.Queryable<GainfoEntity>()
.LeftJoin<DepartmentEntity>((ga, department) => department.No == ga.DepartmentNo)
.Where(ga => ga.No == userNo)
.Select(ga => new
{