From d12834d7d7040e89a824ef20c828ddb0eb7be8f6 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 23 Dec 2024 18:05:35 +0700
Subject: [PATCH] fix: get redo if not complete only

---
 src/controllers/06-request-list-controller.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts
index 223124f..fa6bd24 100644
--- a/src/controllers/06-request-list-controller.ts
+++ b/src/controllers/06-request-list-controller.ts
@@ -230,7 +230,14 @@ export class RequestListController extends Controller {
           OR: [
             { workStatus: RequestWorkStatus.Ready },
             {
-              task: { some: { taskStatus: TaskStatus.Redo } },
+              task: {
+                some: {
+                  taskStatus: TaskStatus.Redo,
+                  requestWorkStep: {
+                    workStatus: { notIn: [RequestWorkStatus.Completed, RequestWorkStatus.Ended] },
+                  },
+                },
+              },
             },
           ],
         },