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

v3.4.6

Browse Source
This commit is contained in:
潘飞
2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/Tnb.WorkFlow/Manager/FlowTaskUserUtil.cs
View File

@@ -138,7 +138,7 @@ public class FlowTaskUserUtil
try
{
var Token = _userManager.ToKen.IsNotEmptyOrNull() ? _userManager.ToKen : _cacheManager.Get<List<UserOnlineModel>>(CommonConst.CACHEKEYONLINEUSER + _userManager.TenantId).Find(x => x.userId == _userManager.UserId).token;
var data = await approversProperties.getUserUrl.SetHeaders(new { Authorization = Token }).GetAsStringAsync();
var data = await approversProperties.getUserUrl.SetHeaders(new { Authorization = Token }).SetBody(flowTaskParamter.formData).PostAsStringAsync();
var result = data.ToObject<RESTfulResult<object>>();
if (result.IsNotEmptyOrNull())
{
@@ -250,15 +250,13 @@ public class FlowTaskUserUtil
{
startProperties.errorRule = "3";
}
// 创建人
var userId = type == 0 ? _userManager.UserId : flowTaskParamter.flowTaskEntity.CreatorUserId;
var handleIds = await GetFlowUserId(flowTaskParamter, approverPropertiers, nextFlowTaskNodeEntity);
if (handleIds.Count == 0 && isShuntNodeCompletion)
{
switch (startProperties.errorRule)
{
case "1":
handleIds.Add("admin");
handleIds.Add(_userManager.GetAdminUserId());
break;
case "2":
if ((await _usersService.GetUserListByExp(x => startProperties.errorRuleUser.Contains(x.Id) && x.DeleteMark == null && x.EnabledMark == 1)).Any())
@@ -267,7 +265,7 @@ public class FlowTaskUserUtil
}
else
{
handleIds.Add("admin");
handleIds.Add(_userManager.GetAdminUserId());
}
break;
case "3":
@@ -291,7 +289,7 @@ public class FlowTaskUserUtil
&& x.NodePropertyJson.ToObject<ApproversProperties>().assigneeType == 7);
if (falag)
{
handleIds.Add("admin");
handleIds.Add(_userManager.GetAdminUserId());
}
else
{
@@ -370,6 +368,14 @@ public class FlowTaskUserUtil
var userList = await GetUserDefined(flowTaskParamter.approversProperties, 1);
userList = await GetExtraRuleUsers(userList, flowTaskParamter.approversProperties.extraCopyRule, flowTaskParamter.flowTaskOperatorEntity.TaskId);
circulateUserList = circulateUserList.Union(userList).ToList();
if (flowTaskParamter.approversProperties.isInitiatorCopy)
{
circulateUserList.Add(flowTaskParamter.flowTaskEntity.CreatorUserId);
//if (flowTaskParamter.flowTaskEntity.DelegateUser.IsNotEmptyOrNull())
//{
// circulateUserList.Add(flowTaskParamter.flowTaskEntity.DelegateUser);
//}
}
}
foreach (var item in circulateUserList.Distinct())
{
@@ -555,14 +561,14 @@ public class FlowTaskUserUtil
}
else
{
childTaskCrUserList.Add("admin");
childTaskCrUserList.Add(_userManager.GetAdminUserId());
}
break;
case "6":
childTaskCrUserList.Add(flowTaskParamter.flowTaskEntity.CreatorUserId);
break;
default:
childTaskCrUserList.Add("admin");
childTaskCrUserList.Add(_userManager.GetAdminUserId());
break;
}
}