| Line 524... |
Line 524... |
| 524 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
524 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| 525 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null,
|
525 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder, null,
|
| 526 |
searchTerm, offset, limit);
|
526 |
searchTerm, offset, limit);
|
| 527 |
} else {
|
527 |
} else {
|
| 528 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
528 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 529 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
529 |
Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, null, searchTerm, offset,
|
| 530 |
limit);
|
530 |
limit);
|
| 531 |
}
|
531 |
}
|
| 532 |
|
532 |
|
| 533 |
} else {
|
533 |
} else {
|
| 534 |
|
534 |
|
| 535 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
535 |
if (ticketStatus.equals(TicketStatus.RESOLVED)) {
|
| 536 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder,
|
536 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(), Optional.empty(), sortOrder,
|
| 537 |
ticketSearchType, searchTerm, offset, limit);
|
537 |
ticketSearchType, searchTerm, offset, limit);
|
| 538 |
} else {
|
538 |
} else {
|
| 539 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
539 |
tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
|
| 540 |
Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, ticketSearchType,
|
540 |
Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, ticketSearchType,
|
| 541 |
searchTerm, offset, limit);
|
541 |
searchTerm, offset, limit);
|
| 542 |
}
|
542 |
}
|
| 543 |
}
|
543 |
}
|
| 544 |
ticketAssigneds = ticketAssignedRepository
|
544 |
ticketAssigneds = ticketAssignedRepository
|
| 545 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
545 |
.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
|