src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -54,10 +54,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
     public async Task<string> StartWorkflowAsync(StartWorkflowDto dto, CancellationToken cancellationToken = default)
     {
-        //var validator = new StartWorkflowDtoValidator();
-        //var validResult = validator.Validate(dto);
-        //if (!validResult.IsValid)
-        //    throw new UserFriendlyException(string.Join(',', validResult.Errors), "非法参数");
         if (string.IsNullOrEmpty(dto.DefinitionCode) && string.IsNullOrEmpty(dto.DefinitionModuleCode))
             throw new UserFriendlyException("非法参数");
 

src/Hotline.Share/Dtos/Roles/AddAccessLevelDto.cs

@@ -0,0 +1,26 @@
+using Hotline.Share.Enums.Settings;
+
+namespace Hotline.Share.Dtos.Roles;
+
+public record AddAccessLevelDto
+{
+    /// <summary>
+    /// 角色ID
+    /// </summary>
+    public string RoleId { get; set; }
+
+    /// <summary>
+    /// 角色Code
+    /// </summary>
+    public string RoleCode { get; set; }
+
+    /// <summary>
+    /// 访问等级
+    /// </summary>
+    public ETableAccessLevel AccessLevel { get; set; }
+
+    /// <summary>
+    /// 表名
+    /// </summary>
+    public string TableName { get; set; }
+}

src/Hotline.Share/Dtos/Roles/RoleAuthorityDto.cs

@@ -1,6 +1,4 @@
-using Hotline.Share.Enums.Settings;
-
-namespace Hotline.Share.Dtos.Roles
+namespace Hotline.Share.Dtos.Roles
 {
     public record RoleAuthorityDto
     {
@@ -13,38 +11,4 @@ namespace Hotline.Share.Dtos.Roles
         public List<string> SystemButtonArr { get; set; }
 
     }
-
-    public record AddAccessLevelDto
-    {
-        /// <summary>
-        /// 角色ID
-        /// </summary>
-        public string RoleId { get; set; }
-
-        /// <summary>
-        /// 角色Code
-        /// </summary>
-        public string RoleCode { get; set; }
-
-        /// <summary>
-        /// 访问等级
-        /// </summary>
-        public ETableAccessLevel AccessLevel { get; set; }
-
-        /// <summary>
-        /// 表名
-        /// </summary>
-        public string TableName { get; set; }
-    }
-
-    public record UpdateDataAuthorityDto
-    {
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 访问等级
-        /// </summary>
-        public ETableAccessLevel AccessLevel { get; set; }
-    }
-
 }

src/Hotline.Share/Dtos/Roles/UpdateDataAuthorityDto.cs

@@ -0,0 +1,13 @@
+using Hotline.Share.Enums.Settings;
+
+namespace Hotline.Share.Dtos.Roles;
+
+public record UpdateDataAuthorityDto
+{
+    public string Id { get; set; }
+
+    /// <summary>
+    /// 访问等级
+    /// </summary>
+    public ETableAccessLevel AccessLevel { get; set; }
+}

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -809,7 +809,14 @@ namespace Hotline.FlowEngine.Workflows
                 : EStepCountersignStatus.InCountersign;
             var subStep = CreateSubStep(stepBox, handler, dto.NextStepCode, dto.NextMainHandler, null, startCountersignId, null,
                 EWorkflowStepStatus.Completed, nextCountersignStatus);
+            subStep.Accept(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.RequiredOrgCode, _sessionContext.OrgName);
+            //step办理状态
+            subStep.StepComplete(
+                _sessionContext.RequiredUserId, _sessionContext.UserName,
+                _sessionContext.RequiredOrgCode, _sessionContext.OrgName,
+                dto.NextStepCode);
             _mapper.Map(dto, subStep);
+
             stepBox.Steps.Add(subStep);
             await _workflowStepRepository.AddAsync(subStep, cancellationToken);
         }