fix: pending task not show for user
This commit is contained in:
parent
697111d5f6
commit
a1b5fd73bc
1 changed files with 30 additions and 12 deletions
|
|
@ -723,20 +723,38 @@ export class UserTaskController extends Controller {
|
|||
requestWorkStep: { responsibleUserId: req.user.sub },
|
||||
},
|
||||
},
|
||||
userTask: userTaskStatus
|
||||
? {
|
||||
some: {
|
||||
userTaskStatus:
|
||||
AND: userTaskStatus
|
||||
? [
|
||||
{
|
||||
OR:
|
||||
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,
|
||||
OR: queryOrNot(query, [
|
||||
{ code: { contains: query, mode: "insensitive" } },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue