libin 1 month ago
parent
commit
3ddb98a9f4

+ 5 - 5
src/Hotline.Api/Controllers/OrderController.cs

@@ -5550,7 +5550,7 @@ public class OrderController : BaseController
                     throw UserFriendlyException.SameMessage("工单已不允许退回!");
             }
 
-            if ((oneSendBack && isOrgToCenter) || (twoSendBack && isSecondToFirstOrgLevel))
+            if ((oneSendBack && isOrgToCenter) || (twoSendBack && isSecondToFirstOrgLevel) || (!string.IsNullOrEmpty(dto.AssignStepId)))
             {
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = EOrderStatus.SendBackAudit })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
@@ -6117,10 +6117,10 @@ public class OrderController : BaseController
                 },
                 HttpContext.RequestAborted);
 
-            //         if (order.ActualHandleOrgName != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
-            //         {
-            //             await _circularRecordDomainService.OrderSpecialCircularMessage(special, order, HttpContext.RequestAborted);
-            //}
+   //         if (order.ActualHandleOrgCode != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
+   //         {
+   //             await _circularRecordDomainService.OrderSpecialCircularMessage(special, order, HttpContext.RequestAborted);
+			//}
 
             if (string.IsNullOrEmpty(currentStep?.HandlerOrgId))
             {

+ 1 - 1
src/Hotline.Application/Orders/OrderApplication.cs

@@ -4107,7 +4107,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 cancellation);
 
 
-		//if (order.ActualHandleOrgName != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
+		//if (order.ActualHandleOrgCode != OrgSeedData.CenterId && order.Status < EOrderStatus.Filed)
 		//{
 		//	await _circularRecordDomainService.OrderSpecialCircularMessage(special, order, cancellation);
 		//}

+ 2 - 2
src/Hotline/Article/CircularRecordDomainService.cs

@@ -195,8 +195,8 @@ namespace Hotline.Article
 			};
 			var groups = new CircularReadGroupDto
 			{
-				OrgId = special.OrgId,
-				OrgName = special.OrgName
+				OrgId = order.ActualHandleOrgCode,
+				OrgName = order.ActualHandleOrgName
 			};
 			cMessage.CircularReadGroups = new List<CircularReadGroupDto> { groups };