wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程bug

Browse Source
This commit is contained in:
周科达
2023-07-04 17:33:20 +08:00
parent 6310748276
commit 3969f09b31
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/Tnb.WorkFlow/Manager/FlowTaskOtherUtil.cs
View File

@@ -418,6 +418,13 @@ public class FlowTaskOtherUtil
mapRule = GetMapRule(approversPro.assignList, flowTaskParamter.flowTaskNodeEntity.NodeCode);
}
var data =await _runService.GetFlowFormDataDetails(thisFormId, flowTaskParamter.flowTaskEntity.Id);
if (!data.ContainsKey("flowId"))//modifyby zhoukeda 20230704
{
if (((Dictionary<string, object>)flowTaskParamter.formData).TryGetValue("flowId",out var value))
{
data.Add("flowId",value);
}
}
var nextFormData = await _runService.SaveDataToDataByFId(thisFormId, nextFormId, mapRule, data);
nextNodeData[item.NodeCode] = nextFormData;
}

3
workflow/Tnb.WorkFlow/Repository/FlowTaskRepository.cs
View File

@@ -1389,7 +1389,8 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
status = a.Status,
userName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.HandleId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
operatorId = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.OperatorId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
creatorTime = SqlFunc.IsNullOrEmpty(b.CreatorTime) ? a.HandleTime : b.CreatorTime,
// creatorTime = SqlFunc.IsNullOrEmpty(b.CreatorTime) ? a.HandleTime : b.CreatorTime,
creatorTime = b.CreatorTime==null ? a.HandleTime : b.CreatorTime, //modifyby zhoukeda 20230704
fileList = a.FileList
}).ToListAsync();
}