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 d2fe0cd7..fe0b8472 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 @@ -3288,7 +3288,7 @@ public class QmsIssueTicketControllerService { boolean creatorCanShut = isCreator && isCompletedStatus; vo.setIsReview(responsibleCanReview || handlerCanReview || leaderCanReview); - vo.setIsDispatch(responsibleCanDispatch || creatorCanDispatch); + vo.setIsDispatch((responsibleCanDispatch && !leaderCanReview) || creatorCanDispatch); vo.setIsEdit(handlerCanEdit); vo.setIsShut(creatorCanShut); diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java index f2d9d48e..e7f2a957 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java @@ -61,12 +61,6 @@ public class QmsPqcTaskRecordControllerService { @Resource private IQmsIssueTicketService issueTicketService; - @Resource - private IQmsIssueTicketToDoService issueTicketToDoService; - - @Resource - private IQmsIssueTicketProcessService issueTicketProcessService; - @Resource private IUserService userService; @@ -1570,12 +1564,6 @@ public class QmsPqcTaskRecordControllerService { issueTicketService.save(ticket); - QmsIssueTicketProcess ticketProcess = new QmsIssueTicketProcess() - .setIssueTicketId(ticket.getId()) - .setHandlerUserId(taskRecord.getReviewerId()) - .setHandlerUserName(taskRecord.getReviewerName()); - issueTicketProcessService.save(ticketProcess); - // 2. 任务总体合格时,仅生成工单,不创建重检任务 if (!Boolean.FALSE.equals(taskRecord.getEnable())) { return ticket.getId();