From b76b953bcae834ad2bd38626f9ab973f7ec26ab4 Mon Sep 17 00:00:00 2001 From: hjhan Date: Fri, 6 Feb 2026 17:06:49 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(ClientModule):=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=8D=E8=83=BD=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=A9=BA=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=BC=82=E5=B8=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1ab74826aa57cbbe7ec67404c48f33d7056387c4. --- .../Modules/ClientModule/ClientQueryService.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/YLErpDAL/Modules/ClientModule/ClientQueryService.cs b/YLErpDAL/Modules/ClientModule/ClientQueryService.cs index 14edc1d4..58f59b41 100644 --- a/YLErpDAL/Modules/ClientModule/ClientQueryService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientQueryService.cs @@ -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); } }