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

ygb

Browse Source
This commit is contained in:
guob yuano
2026-10-21 11:30:06 +08:00
parent 5c72116981
commit 83dd20fa97
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -667,16 +667,16 @@ public class DeviceUploadLogService : IDeviceUploadLogService
}
}
List<string> userCodes = null;
List<string> userCodeList = null;
if (request.UserCode.IsPresent())
{
if (request.UserCode.IndexOf(",") != -1 || request.UserCode.IndexOf("，") != -1)
{
userCodes = request.UserCode.Replace("，", ",").Split(",", StringSplitOptions.None).ToList();
userCodeList = request.UserCode.Replace("，", ",").Split(",", StringSplitOptions.None).ToList();
}
else
{
userCodes = new List<string>() { request.UserCode };
userCodeList = new List<string>() { request.UserCode };
}
}
@@ -695,7 +695,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
|| searchs.Contains(os.Supplier)
|| searchs.Contains(os.SapCode)
)
.WhereIF(isNormalSearch && userCodes != null, (x, device, ga, os) => userCodes.Contains(x.DeviceUniqueNo))
.WhereIF(isNormalSearch && userCodeList != null, (x, device, ga, os) => userCodeList.Contains(x.DeviceUniqueNo))
.WhereIF(isNormalSearch && request.DeviceUniqueNo.IsPresent(), (x, device, ga, os) => x.DeviceUniqueNo == request.DeviceUniqueNo)
.WhereIF(request.Search.IsPresent() && isNormalSearch, (x, device, ga, os) =>
x.UserUniqueNo == request.Search