diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 25df9292..11ae5675 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -1886,31 +1886,7 @@ public class QmsIssueTicketControllerService { // 判断是否为工单创建者 boolean isCreator = ticket.getCreateUserId() != null && ticket.getCreateUserId().equals(currentUserId); - List processes = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(processes)) { - Long temporaryTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施"); - Long permanentTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施"); - List processIds = processes.stream() - .map(QmsIssueTicketProcess::getId) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - - if (temporaryTypeId != null && CollectionUtil.isNotEmpty(processIds)) { - List temporaryMeasures = issueTicketProcessMeasureService.lambdaQuery() - .in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIds) - .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, temporaryTypeId) - .list(); - convertToMeasureVO(temporaryMeasures); - } - - if (permanentTypeId != null && CollectionUtil.isNotEmpty(processIds)) { - List permanentMeasures = issueTicketProcessMeasureService.lambdaQuery() - .in(QmsIssueTicketProcessMeasure::getIssueTicketProcessId, processIds) - .eq(QmsIssueTicketProcessMeasure::getMeasureTypeId, permanentTypeId) - .list(); - convertToMeasureVO(permanentMeasures); - } - } + List processes; if (isCreator) { // 工单创建者:返回全部处理记录