diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts index cf27c43..320dddb 100644 --- a/src/controllers/07-task-controller.ts +++ b/src/controllers/07-task-controller.ts @@ -545,6 +545,7 @@ export class UserTaskController extends Controller { prisma.taskOrder.findMany({ where, include: { + userTask: true, institution: true, createdBy: true, }, @@ -552,6 +553,17 @@ export class UserTaskController extends Controller { prisma.taskOrder.count({ where }), ]); - return { result, page, pageSize, total }; + return { + result: result.map((lhs) => ({ + ...lhs, + taskOrderStatus: + lhs.userTask.find((rhs) => rhs.taskOrderId === lhs.id)?.userTaskStatus ?? + lhs.taskOrderStatus, + userTask: undefined, + })), + page, + pageSize, + total, + }; } }