去掉流程 指定部门和角色

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -1214,7 +1214,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
                 else
                 {
                     businessType = EBusinessType.Department;
-                    handlerType = EHandlerType.AssignedOrgOrRole;
                     roleName = handleRoleName;
                     //上级部门Id
                     upperOrgId = _sessionContext.RequiredOrgId.GetHigherOrgId(orgLevel);
@@ -1240,7 +1239,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
                         ? EBusinessType.Send
                         : EBusinessType.Department;
                 orgLevel = _sessionContext.OrgLevel - 1;
-                handlerType = EHandlerType.AssignedOrgOrRole;
                 if (orgLevel <= 0) orgLevel = 1;
                 roleName = handleRoleName;
 				//上级部门Id
@@ -1283,7 +1281,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 				else
 				{
 					businessType = EBusinessType.Department;
-					handlerType = EHandlerType.AssignedOrgOrRole;
 					upperOrgId = _sessionContext.RequiredOrgId.GetHigherOrgId(_sessionContext.OrgLevel);
                     if (!isLead)
                     {
@@ -1326,7 +1323,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 						: EBusinessType.Department;
 				orgLevel = _sessionContext.OrgLevel - 1;
 				if (orgLevel <= 0) orgLevel = 1;
-				handlerType = EHandlerType.AssignedOrgOrRole;
 				upperOrgId = _sessionContext.RequiredOrgId.GetHigherOrgId(_sessionContext.OrgLevel);
 				isLead = _sessionContext.Roles.Any(x => x == leadRoleCode);
 				if (!isLead)
@@ -1713,8 +1709,8 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
             case EHandlerType.AssignedUser:
                 return FlowAssignInfo.Create(EFlowAssignType.User, handlers, isStartCountersign);
-            case EHandlerType.AssignedOrgOrRole:
-                return FlowAssignInfo.Create(EFlowAssignType.OrgAndRole, handlers, isStartCountersign);
+            //case EHandlerType.AssignedOrgOrRole:
+            //    return FlowAssignInfo.Create(EFlowAssignType.OrgAndRole, handlers, isStartCountersign);
 
             default:
                 throw new ArgumentOutOfRangeException();

src/Hotline.Share/Enums/FlowEngine/EHandlerType.cs

@@ -34,9 +34,9 @@ public enum EHandlerType
     [Description("指定部门")]
     AssignedOrg = 4,
 
-    /// <summary>
-    /// 指定部门与角色
-    /// </summary>
-    [Description("指定部门与角色")]
-	AssignedOrgOrRole = 5,
+ //   /// <summary>
+ //   /// 指定部门与角色
+ //   /// </summary>
+ //   [Description("指定部门与角色")]
+	//AssignedOrgOrRole = 5,
 }

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -2840,8 +2840,8 @@ namespace Hotline.FlowEngine.Workflows
 
                 case EHandlerType.AssignedUser:
                     return FlowAssignInfo.Create(EFlowAssignType.User, handlers, isStartCountersign);
-                case EHandlerType.AssignedOrgOrRole:
-                    return FlowAssignInfo.Create(EFlowAssignType.OrgAndRole, handlers, isStartCountersign);
+                //case EHandlerType.AssignedOrgOrRole:
+                //    return FlowAssignInfo.Create(EFlowAssignType.OrgAndRole, handlers, isStartCountersign);
 
                 default:
                     throw new ArgumentOutOfRangeException();