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

fix 离职人员

Browse Source
This commit is contained in:
liguoyang
2026-05-15 09:50:59 +08:00
parent 074e4919fd
commit 137481aa42
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -215,22 +215,24 @@ public class AssignmentService : IAssignmentService
var userInfo = await _dbContext.Queryable<GainfoEntity>() var userInfo = await _dbContext.Queryable<GainfoEntity>()
.Where(x => x.Code == userCode) .Where(x => x.Code == userCode)
.Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo }) .Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo })
.FirstAsync() .FirstAsync();
??
await _dbContext.Queryable<GainfoLeaveEntity>() var isCurrent = userInfo != null;
userInfo ??= await _dbContext.Queryable<GainfoLeaveEntity>()
.Where(x => x.Code == userCode) .Where(x => x.Code == userCode)
.Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo }) .Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo })
.FirstAsync(); .FirstAsync();
var deviceCodes = isCurrent ? await _gainfoPermissionApi.GetPermissionsDeviceCodesAsync(userCode) : new List<Guid>();
var deviceCodes = await _gainfoPermissionApi.GetPermissionsDeviceCodesAsync(userCode);
//通过真实设备号获取对应的虚拟设备号和权限值 //通过真实设备号获取对应的虚拟设备号和权限值
var elevatorAcsFloors = await _dbContext.Queryable<ElevatorAcsFloorEntity>() var elevatorAcsFloors = await _dbContext.Queryable<ElevatorAcsFloorEntity>()
.LeftJoin<DeviceEntity>((x, d) => x.VirtualDeviceUniqueNo == d.UniqueNo) .LeftJoin<DeviceEntity>((x, d) => x.VirtualDeviceUniqueNo == d.UniqueNo)
.Where((x, d) => x.RealDeviceUniqueNo == deviceUniqueNo && deviceCodes.Contains(d.Code)) .Where((x, d) => x.RealDeviceUniqueNo == deviceUniqueNo)
.WhereIF(isCurrent, (x, d) => deviceCodes.Contains(d.Code))
.Select(x => new { x.VirtualDeviceUniqueNo, x.AcsValue }) .Select(x => new { x.VirtualDeviceUniqueNo, x.AcsValue })
.ToListAsync(); .ToListAsync();
//虚拟设备号列表 //虚拟设备号列表