Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -323,6 +323,9 @@ namespace Hotline.Application.StatisticalReport
         {
             RefAsync<int> total = 0;
             ISugarQueryable<SelectOrderId> query = null;
+            if (string.IsNullOrEmpty(dto.ParentOrgCode) && dto.OrgCode == _sessionContext.RequiredOrgId)
+                dto.ParentOrgCode = _sessionContext.RequiredOrgId;
+
             switch (dto.StatisticsType)
             {
                 case EStatisticsType.YBOrderCountNum:

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1746,7 +1746,7 @@ namespace Hotline.FlowEngine.Workflows
                         }
                     }
                 };
-                if (_appOptions.Value.IsZiGong && handlers.Any())
+                if (_appOptions.Value.IsZiGong && handlers != null && handlers.Any())
                 {
                     dto.NextHandlers = handlers;
                 }