优化审批流程逻辑,支持复杂分支条件
This commit is contained in:
@@ -712,25 +712,7 @@ namespace YLErp.Modules.SystemModule
|
||||
InitGroupId = UserBLL.GetApprovalProcessGroup(userId)
|
||||
};
|
||||
|
||||
// ===== 临时诊断日志(定位触发条件是否生效,验证后删除)=====
|
||||
try
|
||||
{
|
||||
var tn = trade?.TradeNumber ?? "?";
|
||||
var initNotional = trade?.OriginalStockEqvNotional ?? 0;
|
||||
System.Diagnostics.Debug.WriteLine($"[ApplyTriggerOnStart] trade={tn}, 期初名义本金={initNotional}, 起点order={start.order}, 起点triggerCondition={start.triggerCondition ?? "(空)"}, 节点数={tradeProcess.Count}");
|
||||
foreach (var n in tradeProcess)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($" 节点 order={n.order}, node={n.node}, roleId={n.roleId}, triggerCondition={n.triggerCondition ?? "(空)"}");
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
var target = ConditionEvaluator.FindFirstTriggeredNode(tradeProcess, start, ctx);
|
||||
try
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"[ApplyTriggerOnStart] FindFirstTriggeredNode 结果 = {(target == null ? "null(全不满足,直接通过)" : "order=" + target.order)}");
|
||||
}
|
||||
catch { }
|
||||
|
||||
if (target == null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user