lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 01:58:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 分离会签和网关功能

Browse Source
This commit is contained in:
wintel
2025-04-17 23:37:50 +08:00
parent 1b0a9193d1
commit 3eb94d7f21
1 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OpenAuth.App/Flow/FlowRuntime.cs
View File

@@ -40,7 +40,8 @@ namespace OpenAuth.App.Flow
flowInstanceId = instance.Id;
//网关开始节点和流程结束节点没有下一步
if (GetCurrentNodeType() == Define.NODE_TYPE_FORK || GetCurrentNodeType() == Define.NODE_TYPE_END)
if (GetCurrentNodeType() == Define.NODE_TYPE_FORK
|| GetCurrentNodeType() == Define.NODE_TYPE_END)
{
nextNodeId = "-1";
}
@@ -618,6 +619,10 @@ namespace OpenAuth.App.Flow
{
makerList = GetForkNodeMakers(nextNodeId);
}
else if (GetNextNodeType() == Define.NODE_TYPE_MULTI_INSTANCE) //如果是多实例、会签节点
{
makerList = GetMultiInstanceNodeMakers(nextNodeId);
}
else if (nextNode.setInfo.NodeDesignate == Define.RUNTIME_SPECIAL_ROLE)
{
//如果是运行时指定角色
@@ -698,6 +703,65 @@ namespace OpenAuth.App.Flow
return makerList;
}
/// <summary>
/// 计算多实例、会签节点的执行人
/// </summary>
/// <param name="nodeId"></param>
/// <returns></returns>
private string GetMultiInstanceNodeMakers(string nodeId)
{
if(GetNodeType(nodeId) != Define.NODE_TYPE_MULTI_INSTANCE)
{
throw new Exception("当前节点不是会签节点，请联系管理员");
}
var node = Nodes[nodeId];
string[] makerList = Array.Empty<string>(); // 执行人列表
var sugarClient = AutofacContainerModule.GetService<ISqlSugarClient>();
if (node.setInfo.NodeDesignate == Define.SPECIAL_USER) //指定成员
{
makerList = node.setInfo.NodeDesignateData.datas;
}
else if (node.setInfo.NodeDesignate == Define.SPECIAL_ROLE) //指定角色
{
var revelanceApp = AutofacContainerModule.GetService<RevelanceManagerApp>();
makerList = revelanceApp.Get(Define.USERROLE, false, node.setInfo.NodeDesignateData.datas).ToArray();
}
else if (node.setInfo.NodeDesignate == Define.SPECIAL_SQL) //指定SQL
{
//如果是指定SQL，则需要执行SQL，并返回结果
var sql = ReplaceSql(node.setInfo.NodeDesignateData.datas[0]);
makerList = sugarClient.Ado.SqlQuery<string>(sql).ToArray();
}
else
{
throw new Exception("会签节点，不支持该类型，请重新设计流程模板");
}
//写入到FlowApprover
var users = sugarClient.Queryable<SysUser>().Where(u => makerList.Contains(u.Id)).ToList();
int order = 1;
foreach (var user in users)
{
var flowApprover = new FlowApprover
{
InstanceId = flowInstanceId,
ActivityId = nodeId,
ApproverId = user.Id,
ApproverName = user.Name,
OrderNo = order++,
ApproveType = node.setInfo.NodeConfluenceType,
ReturnToSignNode = false,
Reason = "",
CreateDate = DateTime.Now
};
sugarClient.Insertable(flowApprover).ExecuteCommand();
}
return GenericHelpers.ArrayToString(makerList, "");
}
/// <summary>
/// 计算节点执行人
/// </summary>