Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(ClientModule): 客户列表不能翻页报错 客户端查询服务中的空引用异常"

Browse Source 
This reverts commit 1ab74826aa.
This commit is contained in:
hjhan
2026-02-06 17:06:49 +08:00
parent 1ab74826aa
commit b76b953bca
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ClientModule/ClientQueryService.cs
+3 -14
View File
@@ -1,4 +1,4 @@
using Autofac.Features.Indexed;
using Autofac.Features.Indexed;
using Autofac.Features.OwnedInstances;
using BaseOUDAL;
using ClosedXML;
@@ -452,23 +452,12 @@ namespace YLErp.Modules.ClientModule
clientLinq.ApprovalRole = roles.Where(x => x.Id == clientLinq.ProcessRoleId)?.FirstOrDefault()?.Name;
if (clientLinq.ApprovalStatus == "审批中")
{
// 添加空值检查并记录日志
if (clientLinq.auditLog != null)
if (clientLinq.auditLog.OptType.Contains("开户审批"))
{
if (clientLinq.auditLog.OptType.Contains("开户审批"))
{
clientLinq.ApprovalStatus = GetApprovalStatus(openProcessList.ToList(), clientLinq.ApprovalStatus, clientLinq.ApprovalOrderId, clientLinq.ProcessOrderBranch);
}
else
{
clientLinq.ApprovalStatus = GetApprovalStatus(clientProcessList.ToList(), clientLinq.ApprovalStatus, clientLinq.ApprovalOrderId, clientLinq.ProcessOrderBranch);
}
clientLinq.ApprovalStatus = GetApprovalStatus(openProcessList.ToList(), clientLinq.ApprovalStatus, clientLinq.ApprovalOrderId, clientLinq.ProcessOrderBranch);
}
else
{
// 记录auditLog为空的情况，便于后续调试
LogFactory.GetLogger("ClientQueryService").Error("ClientQueryService.SearchList: auditLog is null for client id: " + clientLinq.id + ", ApprovalOrderId: " + clientLinq.ApprovalOrderId + ", ProcessOrderBranch: " + clientLinq.ProcessOrderBranch + ", ApprovalStatus: " + clientLinq.ApprovalStatus);
// 当auditLog为空时，无法判断是否为开户审批，按一般审批流程处理
clientLinq.ApprovalStatus = GetApprovalStatus(clientProcessList.ToList(), clientLinq.ApprovalStatus, clientLinq.ApprovalOrderId, clientLinq.ProcessOrderBranch);
}
}