Quellcode durchsuchen

综合查询部门修改为查询Step 甄别流程修改

田爽 vor 5 Monaten
Ursprung
Commit
1f51ac3afc

+ 8 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -2143,9 +2143,15 @@ public class OrderController : BaseController
             HttpContext.RequestAborted);
         if (_sessionContext.OrgIsCenter)
         {
-			if (result.Steps.Any(x => x.Value == "中心初审"))
+            if (result.Steps.Any(x => x.Value == "中心初审"))
+            {
+                result.Steps.Remove(result.Steps.First(x => x.Value == "中心初审"));
+            }
+        }
+        else {
+			if (result.Steps.Any(x => x.Value == "中心班长"))
 			{
-				result.Steps.Remove(result.Steps.First(x => x.Value == "中心初审"));
+				result.Steps.Remove(result.Steps.First(x => x.Value == "中心班长"));
 			}
 		}
 		return result;

+ 2 - 5
src/Hotline.Application/Orders/OrderApplication.cs

@@ -1050,13 +1050,10 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var query = _orderRepository.Queryable();
         if (!isCenter)
         {
-            //todo 可优化
-            query.Where(d => SqlFunc.Subqueryable<WorkflowTrace>()
+            query.Where(d => SqlFunc.Subqueryable<WorkflowStep>()
                 .Where(step => step.ExternalId == d.Id &&
                                !string.IsNullOrEmpty(step.HandlerOrgId) &&
-                               step.HandlerOrgId.StartsWith(_sessionContextProvider.SessionContext.RequiredOrgId) &&
-                               step.TraceState != EWorkflowTraceState.StepRemoveByPrevious &&
-                               step.TraceState != EWorkflowTraceState.StepRemoveByRecall).Any());
+                               step.HandlerOrgId.StartsWith(_sessionContextProvider.SessionContext.RequiredOrgId)).Any());
         }
 
         return query