From 137481aa427c94d1a15b2be0a2045651adaa2ba5 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 15 May 2026 09:50:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A6=BB=E8=81=8C=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 620a56f2..beea0d92 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -215,22 +215,24 @@ public class AssignmentService : IAssignmentService var userInfo = await _dbContext.Queryable() .Where(x => x.Code == userCode) .Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo }) - .FirstAsync() - ?? - await _dbContext.Queryable() + .FirstAsync(); + + var isCurrent = userInfo != null; + + userInfo ??= await _dbContext.Queryable() .Where(x => x.Code == userCode) .Select(x => new { UserId = x.Id, UserNo = x.No, UserCode = x.Code, UserName = x.Name, x.CardNo }) .FirstAsync(); - - var deviceCodes = await _gainfoPermissionApi.GetPermissionsDeviceCodesAsync(userCode); + var deviceCodes = isCurrent ? await _gainfoPermissionApi.GetPermissionsDeviceCodesAsync(userCode) : new List(); //通过真实设备号获取对应的虚拟设备号和权限值 var elevatorAcsFloors = await _dbContext.Queryable() .LeftJoin((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 }) .ToListAsync(); //虚拟设备号列表