From d476cdf74a6c129233ff220d6f6820d0ef4b2524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 15 Jun 2026 22:52:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(todo):=20=E4=BF=AE=E5=A4=8D=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E5=BD=93=E5=89=8D=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改状态判断条件从不等于2改为小于2 - 添加来源类型判断分支 - 当来源类型为0时显示创建人姓名作为当前处理人 - 保持原有逻辑处理非0来源类型的查询方式 --- .../QmsIssueTicketTodoControllerService.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) 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() + ) + ); + } } }); }