fix: pending task not show for user

This commit is contained in:
Methapon2001 2025-01-08 14:23:21 +07:00
parent 697111d5f6
commit a1b5fd73bc

View file

@ -723,20 +723,38 @@ export class UserTaskController extends Controller {
requestWorkStep: { responsibleUserId: req.user.sub }, requestWorkStep: { responsibleUserId: req.user.sub },
}, },
}, },
userTask: userTaskStatus AND: userTaskStatus
? { ? [
some: { {
userTaskStatus: OR:
userTaskStatus === UserTaskStatus.Pending userTaskStatus === UserTaskStatus.Pending
? { in: [UserTaskStatus.Pending, UserTaskStatus.Restart] } ? [
: userTaskStatus, {
userId: req.user.sub, userTask: {
some: {
userTaskStatus: {
in: [UserTaskStatus.Pending, UserTaskStatus.Restart],
},
userId: req.user.sub,
},
},
},
{
userTask: { none: { userId: req.user.sub } },
},
]
: undefined,
userTask:
userTaskStatus !== UserTaskStatus.Pending
? {
some: {
userTaskStatus,
userId: req.user.sub,
},
}
: undefined,
}, },
none: ]
userTaskStatus === UserTaskStatus.Pending
? { userId: req.user.sub, userTaskStatus: { not: UserTaskStatus.Restart } }
: undefined,
}
: undefined, : undefined,
OR: queryOrNot(query, [ OR: queryOrNot(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },