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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4737,7 +4737,7 @@ public class OrderController : BaseController
 	{
         var model = await _orderSecondaryHandlingApplication.Entity(dto.Id, HttpContext.RequestAborted);
         if (model == null || model.State != ESecondaryHandlingState.Apply)
-            throw UserFriendlyException.SameMessage("无效特提审批信息！");
+            throw UserFriendlyException.SameMessage("无效二次办理审批信息！");
         await _orderSecondaryHandlingApplication.AuditAsync(dto, model, HttpContext.RequestAborted);
 	}
 
@@ -4754,7 +4754,7 @@ public class OrderController : BaseController
 		{
 			var model = await _orderSecondaryHandlingApplication.Entity(item, HttpContext.RequestAborted);
 			if (model == null || model.State != ESecondaryHandlingState.Apply)
-				throw UserFriendlyException.SameMessage("无效特提审批信息！");
+				throw UserFriendlyException.SameMessage("无效二次办理审批信息！");
 			await _orderSecondaryHandlingApplication.AuditAsync(dto, model, HttpContext.RequestAborted);
 		}
 	}
@@ -4838,7 +4838,7 @@ public class OrderController : BaseController
 		    secondaryHandling = items;
 	    }
 
-	    var secondaryHandlingDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(secondaryHandling);
+	    var secondaryHandlingDtos = _mapper.Map<ICollection<OrderSecondaryHandlingDto>>(secondaryHandling);
 
 	    dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
 

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -224,7 +224,7 @@ namespace Hotline.Application.Orders
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgHandledAttitude), x => SqlFunc.JsonListObjectAny(x.OrgHandledAttitude, "Key", dto.OrgHandledAttitude))
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgNoSatisfiedReason), x => SqlFunc.JsonField(x.OrgNoSatisfiedReason, "Key") == dto.OrgNoSatisfiedReason)
 				.Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle)
-				//.Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode  == _sessionContext.OrgId) 
+				.Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode == _sessionContext.OrgId)
 				;
 			if (_sessionContext.OrgId != null && !_sessionContext.OrgIsCenter)
 			{