diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index dd57d4dd..bf9136a9 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -224,6 +224,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService _ => throw new UserFriendlyException("不支持当前设备类型") }; + var userTypes = new List(); var userType = request.IsOutsource.HasValue && request.IsOutsource.Value ? GainfoUserTypeEnumType.Outsource : GainfoUserTypeEnumType.Normal; @@ -231,8 +232,16 @@ public class DeviceUploadLogService : IDeviceUploadLogService if (request.UserType.HasValue) { userType = request.UserType.Value; + + + if (request.UserType.Value == GainfoUserTypeEnumType.Normal) + { + userTypes.Add(GainfoUserTypeEnumType.SecurityWhite); + } } + userTypes.Add(userType); + var r = await _dbContext.Queryable() .LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo) .LeftJoin((x, device, ga) => x.UserUniqueNo == ga.Code) @@ -240,7 +249,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService .LeftJoin((x, device, ga, os, gaSap) => gaSap.Code == os.SapCode) .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End) - .Where((x, device) => x.Type == type && x.UserType == userType) + .Where((x, device) => x.Type == type && userTypes.Contains(x.UserType)) .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync) .WhereIF(request.Search.IsPresent() && userType == GainfoUserTypeEnumType.Outsource, (x, device, ga, os) => x.UserUniqueNo == request.Search