From 2bd98a83c1fcd9e27a7aa4a00678ce0ee6fec123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 12 Feb 2026 21:17:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(ticket):=20=E7=A7=BB=E9=99=A4=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84=E8=87=AA=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉管理员移除自己时的业务错误校验逻辑 - 允许管理员从工单处理人员列表中移除自己 - 保留其他工单处理功能的完整性 --- .../mobilebroken/admin/controller/TicketController.java | 6 +++--- .../mobilebroken/gongfu/controller/TicketController.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 3ef29391..2225c7fe 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -422,9 +422,9 @@ public class TicketController extends ControllerBase { Ticket ticket = ticketService.getById(request.getTicketId()); List handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())) - && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))) - .throwMessage("不可以移除自己"); +// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())) +// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))) +// .throwMessage("不可以移除自己"); Ticket ticket1 = ticketService.addTicketHandle(request); request.getUserIds().removeAll(handleIds); if (CollectionUtil.isNotEmpty(request.getUserIds())) { diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java index abe09fe7..42f25a9a 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java @@ -401,9 +401,9 @@ public class TicketController extends ControllerBase { public ApiResult addTicketHandle(@Valid @RequestBody TicketHandleAddRequest request) { GongfuTicket ticket = ticketService.getById(request.getTicketId()); List handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())) - && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))) - .throwMessage("不可以移除自己"); +// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())) +// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))) +// .throwMessage("不可以移除自己"); GongfuTicket ticket1 = ticketService.addTicketHandle(request); request.getUserIds().removeAll(handleIds); if (CollectionUtil.isNotEmpty(request.getUserIds())) {