mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2025-04-30 04:45:56 +08:00
fix issue #I3ZCIX 审批过程中可以修改表单内容,并可以控制表单字段读写权限
This commit is contained in:
parent
10e255d0b3
commit
95fe5259c7
@ -79,6 +79,11 @@
|
||||
/// 会签拒绝的个数
|
||||
/// </summary>
|
||||
public int? ConfluenceNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 可写的表单项ID
|
||||
/// </summary>
|
||||
public string[] CanWriteFormItemIds { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -296,6 +296,11 @@ namespace OpenAuth.App
|
||||
|
||||
flowInstance.SchemeContent = JsonHelper.Instance.Serialize(wfruntime.ToSchemeObj());
|
||||
|
||||
if (!string.IsNullOrEmpty(request.FrmData))
|
||||
{
|
||||
flowInstance.FrmData = request.FrmData;
|
||||
}
|
||||
|
||||
UnitWork.Update(flowInstance);
|
||||
UnitWork.Add(flowInstanceOperationHistory);
|
||||
|
||||
@ -596,9 +601,15 @@ namespace OpenAuth.App
|
||||
var flowinstance = Get(id);
|
||||
var resp =flowinstance.MapTo<FlowVerificationResp>();
|
||||
var runtime = new FlowRuntime(flowinstance);
|
||||
if (runtime.currentNode != null && runtime.currentNode.setInfo !=null)
|
||||
{
|
||||
resp.CanWriteFormItemIds = runtime.currentNode.setInfo.CanWriteFormItemIds;
|
||||
}
|
||||
|
||||
if (runtime.nextNode != null && runtime.nextNode.setInfo !=null && runtime.nextNodeType != 4)
|
||||
{
|
||||
resp.NextNodeDesignateType = runtime.nextNode.setInfo.NodeDesignate;
|
||||
resp.CanWriteFormItemIds = runtime.currentNode.setInfo.CanWriteFormItemIds;
|
||||
}
|
||||
return resp;
|
||||
}
|
||||
|
@ -25,5 +25,11 @@ namespace OpenAuth.App.Request
|
||||
/// </summary>
|
||||
public string NodeRejectType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 新的表单数据
|
||||
/// 如果该节点有可以修改的表单项时,会提交表单数据信息
|
||||
/// </summary>
|
||||
public string FrmData { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -17,5 +17,10 @@ namespace OpenAuth.App.Response
|
||||
/// 下个节点的执行权限方式
|
||||
/// </summary>
|
||||
public string NextNodeDesignateType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 当前节点的可写表单Id
|
||||
/// </summary>
|
||||
public string[] CanWriteFormItemIds { get; set; }
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user