From eaa887e417a22d72f93801f85909af86517aa096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 12 Feb 2025 16:58:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/TicketController.java | 6 +----- .../nflg/mobilebroken/cfs/controller/TiketController.java | 3 +-- 2 files changed, 2 insertions(+), 7 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 3dee957b..76d50b33 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 @@ -97,7 +97,6 @@ public class TicketController extends ControllerBase { /** * 关注或取消关注工单 - * * @param request 请求信息 **/ @PostMapping("followTiket") @@ -309,7 +308,6 @@ public class TicketController extends ControllerBase { /** * 获取工单聊天记录 - * * @param ticketId 工单编号 * @return 聊天记录 **/ @@ -321,7 +319,6 @@ public class TicketController extends ControllerBase { /** * 添加聊天记录 - * * @param request 请求信息 **/ @PostMapping("addChatMessage") @@ -329,8 +326,7 @@ public class TicketController extends ControllerBase { public ApiResult addChatMessage(@Valid @RequestBody AddChatMessageRequest request) { Ticket ticket = ticketService.getById(request.getTicketId()); VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在"); - VUtils.trueThrowBusinessError(Objects.equals(ticket.getState(), TicketState.Revoked.getState()) - || Objects.equals(ticket.getState(), TicketState.Closed.getState())) + VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.Processing.getState()) > 1) .throwMessage("当前工单状态不允许发送消息"); AdminUser user = adminUserService.getById(AdminUserUtil.getUserId()); ChatMessageDTO message = new ChatMessageDTO() diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index d051e814..6c37bab5 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -214,8 +214,7 @@ public class TiketController extends ControllerBase { public ApiResult addChatMessage(@Valid @RequestBody AddChatMessageRequest request){ Ticket ticket = ticketService.getById(request.getTicketId()); VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在"); - VUtils.trueThrowBusinessError(Objects.equals(ticket.getState(), TicketState.Revoked.getState()) - || Objects.equals(ticket.getState(), TicketState.Closed.getState())) + VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.Processing.getState()) > 1) .throwMessage("当前工单状态不允许发送消息"); AppUser user = appUserService.getById(AppUserUtil.getUserId()); ChatMessageDTO message = new ChatMessageDTO()