Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ List<ProjectTeamMember> findActiveConfirmedMembersWithUser(
JOIN FETCH ptm.projectTeam pt
JOIN FETCH pt.course
WHERE ptm.user.id = :userId
AND ptm.recruitmentConfirmStatus = 'CONFIRMED'
AND ptm.recruitmentConfirmStatus IN ('CONFIRMED', 'PENDING')
AND ptm.leftAt IS NULL
AND (:status IS NULL OR pt.status = :status)
ORDER BY ptm.joinedAt DESC
Expand All @@ -112,7 +112,7 @@ List<ProjectTeamMember> findActiveConfirmedMembershipsWithTeamAndCourse(
JOIN FETCH ptm.user
WHERE ptm.projectTeam.id IN :projectTeamIds
AND ptm.leftAt IS NULL
AND ptm.recruitmentConfirmStatus = 'CONFIRMED'
AND ptm.recruitmentConfirmStatus IN ('CONFIRMED', 'PENDING')
ORDER BY ptm.projectTeam.id, ptm.joinedAt ASC
""")
List<ProjectTeamMember> findActiveConfirmedMembersWithUserByProjectTeamIds(
Expand Down
Loading