diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java index 025d8bea..2f94b46a 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java @@ -34,19 +34,22 @@ public class QmsIssueTicketTodoControllerService { if (CollectionUtil.isNotEmpty(pageData.getRecords())) { pageData.getRecords().forEach(item -> { item.setIsRead(true); - if (item.getStatus() != 2) { - item.setCurrentHandleUserName( - StrUtil.join(",", - issueTicketProcessService.lambdaQuery() - .select(QmsIssueTicketProcess::getHandlerUserName) - .eq(QmsIssueTicketProcess::getIssueTicketId, item.getTicketId()) - .list() - .stream() - .map(QmsIssueTicketProcess::getHandlerUserName) - .toList() - ) - - ); + if (item.getStatus() < 2) { + if (item.getSourceType() == 0) { + item.setCurrentHandleUserName(item.getCreateUserName()); + } else { + item.setCurrentHandleUserName( + StrUtil.join(",", + issueTicketProcessService.lambdaQuery() + .select(QmsIssueTicketProcess::getHandlerUserName) + .eq(QmsIssueTicketProcess::getIssueTicketId, item.getTicketId()) + .list() + .stream() + .map(QmsIssueTicketProcess::getHandlerUserName) + .toList() + ) + ); + } } }); }