Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -139,7 +139,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
         var workflow = await _workflowDomainService.CreateWorkflowAsync(wfModule, dto.Title,
             _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, externalId, expiredTimeConfig?.TimeText,
-            expiredTimeConfig.Count, expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, cancellationToken);
+            expiredTimeConfig?.Count, expiredTimeConfig?.TimeType, expiredTimeConfig?.ExpiredTime, cancellationToken);
 
         var startStep = _workflowDomainService.CreateStartStep(workflow, startStepDefine, dto, 
             new List<Kv> { new(_sessionContext.RequiredUserId, _sessionContext.UserName) });
@@ -757,8 +757,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
             case EHandlerType.OrgLevel:
                 //当前操作人所属部门的垂直部门并且属于配置orgLevel的部门
                 var levels = stepDefine.HandlerTypeItems.Select(d => int.Parse(d.Key)).ToList();
-                var upLevels = levels.Where(d => d > _sessionContext.OrgLevel);
-                var lowLevels = levels.Where(d => d < _sessionContext.OrgLevel);
                 // var orgs1 = await _organizeRepository.Queryable()
                 //     .Where(d => d.IsEnable && levels.Contains(d.Level))
                 //     .WhereIF(!isCenter, d => d.Id.StartsWith(levelOneOrgId))
@@ -775,6 +773,8 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
                 }
                 else
                 {
+                    var upLevels = levels.Where(d => d < _sessionContext.OrgLevel).ToList();
+                    var lowLevels = levels.Where(d => d > _sessionContext.OrgLevel).ToList();
                     orgs1 = await query
                         .Where(d => (upLevels.Contains(d.Level) && d.Id.StartsWith(levelOneOrgId)) ||
                                     (lowLevels.Contains(d.Level) && d.Id.Contains(orgId)))

src/Hotline.Application/Handlers/FlowEngine/WorkflowStartHandler.cs

@@ -62,7 +62,8 @@ namespace Hotline.Application.Handlers.FlowEngine
         {
             //基础拉丁字母和中日韩统一表意文字的基础Unicode 块(U+4E00-U+9FCC)。 基本涵盖了除使用西里尔字母以外所有西方国家的文字和亚洲中日韩越的文字
             _logger.LogInformation(
-                $"收到{nameof(StartWorkflowNotify)}, notification: {JsonSerializer.Serialize(notification, new JsonSerializerOptions { Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.CjkUnifiedIdeographs) })}");
+                //$"收到{nameof(StartWorkflowNotify)}, notification: {JsonSerializer.Serialize(notification, new JsonSerializerOptions { Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.CjkUnifiedIdeographs) })}");
+                $"收到{nameof(StartWorkflowNotify)}, workflowId: {notification.Workflow.Id}");
             var workflow = notification.Workflow;
             var data = notification.Dto;