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

src/Hotline.Api/Controllers/DataSharingController.cs

@@ -179,8 +179,7 @@ namespace Hotline.Api.Controllers
         public async Task<PagedDto<PublishDto>> GetOrderByListOpen([FromBody] GetOrderList dto)
         {
             var (total, items) = await _orderRepository.Queryable()
-                .Includes(d => d.OrderPublish)
-                .Where(p => p.OrderPublish.PublishState == true)
+                .Where(p => p.IsPublicity == true)
                 .WhereIF(!string.IsNullOrEmpty(dto.No), p => p.No == dto.No)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), p => p.Title.Contains(dto.Title))
                 .WhereIF(!string.IsNullOrEmpty(dto.Mobile), p => p.Contact.Contains(dto.Mobile))

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -653,7 +653,7 @@ namespace Hotline.Api.Controllers
         [HttpPost("getorderid")]
         public async Task<OpenResponse> GetOrderId([FromBody] GetOrderCodePwd dto)
         {
-            var data = await _orderRepository.GetAsync(p => p.No == dto.OrderNo && p.Password == dto.Pwd && p.Status > EOrderStatus.Published, HttpContext.RequestAborted);
+            var data = await _orderRepository.GetAsync(p => p.No == dto.OrderNo && p.Password == dto.Pwd, HttpContext.RequestAborted);//&& p.Status > EOrderStatus.Published
             return OpenResponse.Ok(WebPortalDeResponse<string>.Success(data?.Id));
         }
 

src/Hotline.Application/Orders/OrderApplication.cs

@@ -2070,7 +2070,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             if (!string.IsNullOrEmpty(order.WorkflowId))
             {
                 current = SessionContextCreator.CreateSessionContext(_sessionContext, "province", _cityBaseConfiguration.Value);
-                await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, order.Status >= EOrderStatus.Filed, cancellationToken);
+                //await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, order.Status >= EOrderStatus.Filed, cancellationToken);
+                await _workflowDomainService.RecallToCenterFirstToSendAsync(order.WorkflowId,"省工单重派", current, order.Status >= EOrderStatus.Filed, cancellationToken);
             }
         }
         return _mapper.Map<AddOrderResponse>(order);

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -2309,7 +2309,7 @@ namespace Hotline.FlowEngine.Workflows
 
             var targetStepNew = targetIsStartStep
                 ? await CreateStartStepAsync(workflow, targetStepDefine, dto,
-                    dto.NextHandlers.First(), traceType, expiredTime, EFlowAssignType.Org, cancellationToken)
+                    dto.NextHandlers.First(), traceType, expiredTime, flowAssignInfo.FlowAssignType, cancellationToken)
                 : (await CreateStepsAsync(workflow, targetStepDefine, targetPrevStep, dto,
                     flowAssignInfo.FlowAssignType, dto.NextHandlers,
                     null, EWorkflowStepStatus.WaitForAccept, ECountersignPosition.None, true, traceType,
@@ -2331,9 +2331,10 @@ namespace Hotline.FlowEngine.Workflows
                 OrgId = targetStep.HandlerOrgId,
                 OrgName = targetStep.HandlerOrgName
             });
-
-            workflow.Assign(flowAssignInfo.FlowAssignType, flowAssignInfo.GetHandlerIds());
-            workflow.ResetHandlers(flowAssignInfo.FlowAssignType, flowAssignInfo.HandlerObjects);
+            
+            //取消维护workflow得冗余字段（FlowedOrgIds, HandlerOrgs）
+            //workflow.Assign(flowAssignInfo.FlowAssignType, flowAssignInfo.GetHandlerIds());
+            //workflow.ResetHandlers(flowAssignInfo.FlowAssignType, flowAssignInfo.HandlerObjects);
 
             //calc workflow expired time
             var isOrgToCenter = CheckIfFlowFromOrgToCenter(workflow, targetStep);