lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-17 10:42:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check bugs

Browse Source
This commit is contained in:
yubaolee 2017-02-28 18:21:36 +08:00
parent 91dfa83e6f
commit 01880fb784
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.App/Extention/WF_Runtime.cs
View File

@ -490,7 +490,7 @@ namespace OpenAuth.App.Extention
{ {
if (item.id.Value == _nextNodeId) if (item.id.Value == _nextNodeId)
{ {
if(item.setInfo.NodeConfluenceType.Value == "0")//0所有步骤通过 if(item.setInfo.NodeConfluenceType.Value == "")//0所有步骤通过 todo:先用空格
{ {
if(flag) if(flag)
{ {

9
OpenAuth.App/WFProcessInstanceService.cs
View File

@ -711,9 +711,10 @@ namespace OpenAuth.App
_makerList = GetMakerList(wfruntime.runtimeModel.nodeDictionary[item], wfruntime.runtimeModel.processId); _makerList = GetMakerList(wfruntime.runtimeModel.nodeDictionary[item], wfruntime.runtimeModel.processId);
if (_makerList != "-1") if (_makerList != "-1")
{ {
var id = AuthUtil.GetCurrentUser().User.Id.ToString();
foreach (string one in _makerList.Split(',')) foreach (string one in _makerList.Split(','))
{ {
if (AuthUtil.GetUserName() == one || AuthUtil.GetUserName().IndexOf(one) != -1) if (id == one || id.IndexOf(one) != -1)
{ {
_VerificationNodeId = item; _VerificationNodeId = item;
break; break;
@ -733,7 +734,7 @@ namespace OpenAuth.App
WFProcessOperationHistory.Content = "【" + "todo name" + "】【" + wfruntime.runtimeModel.nodeDictionary[_VerificationNodeId].name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】不同意,备注：" + description; WFProcessOperationHistory.Content = "【" + "todo name" + "】【" + wfruntime.runtimeModel.nodeDictionary[_VerificationNodeId].name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】不同意,备注：" + description;
} }
string _Confluenceres = wfruntime.NodeConfluence(_VerificationNodeId, flag, AuthUtil.GetUserName(), description); string _Confluenceres = wfruntime.NodeConfluence(_VerificationNodeId, flag, AuthUtil.GetCurrentUser().User.Id.ToString(), description);
var _data = new var _data = new
{ {
SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(), SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(),
@ -789,7 +790,7 @@ namespace OpenAuth.App
{ {
if (flag) if (flag)
{ {
wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, 1, AuthUtil.GetUserName(), description); wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, 1, AuthUtil.GetCurrentUser().User.Id.ToString(), description);
WFProcessInstance.PreviousId = WFProcessInstance.ActivityId; WFProcessInstance.PreviousId = WFProcessInstance.ActivityId;
WFProcessInstance.ActivityId = wfruntime.runtimeModel.nextNodeId; WFProcessInstance.ActivityId = wfruntime.runtimeModel.nextNodeId;
WFProcessInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 WFProcessInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束
@ -968,7 +969,7 @@ namespace OpenAuth.App
foreach (var item in schemeContentJson1.Flow.nodes) foreach (var item in schemeContentJson1.Flow.nodes)
{ {
if (item.id.Value == nodeId) if (item.id.Value == nodeId && item.setInfo != null)
{ {
foreach (var item1 in item.setInfo.frmPermissionInfo) foreach (var item1 in item.setInfo.frmPermissionInfo)
{ {