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

src/Hotline.Api/Controllers/CommonPController.cs

@@ -317,6 +317,12 @@ namespace Hotline.Api.Controllers
 				//部门即将超期
 				var nearlyExpiredDataList = await _orderRepository.Queryable(canView: !IsCenter)
 					.Includes(d => d.OrderDelays)
+					.Where(d => SqlFunc.Subqueryable<WorkflowStep>()
+						.Where(step => step.ExternalId == d.Id &&
+						               ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
+						                (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
+						                (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId))))
+						.Any())
 					.Where(d => d.Status < EOrderStatus.Filed && DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
 					.OrderByDescending(d => d.CreationTime)
 					.Select(d => new HomeOrderDto
@@ -539,6 +545,12 @@ namespace Hotline.Api.Controllers
 				//部门即将超期
 				var nearlyExpiredDataList = await _orderRepository.Queryable(canView: !IsCenter)
 					.Includes(d => d.OrderDelays)
+					.Where(d => SqlFunc.Subqueryable<WorkflowStep>()
+						.Where(step => step.ExternalId == d.Id &&
+						               ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
+						                (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
+						                (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId))))
+						.Any())
 					.Where(d => d.Status < EOrderStatus.Filed && DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
 					.OrderByDescending(d => d.CreationTime)
 					.Select(d => new HomeOrderDto