From 109b49d5ec6a1652cad4071c9934c79ee9360942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 23 Jul 2025 15:58:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-384=20=E7=94=A8=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/TicketController.java | 8 +++++--- .../src/main/resources/mapper/TBaseDeviceTypeMapper.xml | 2 ++ 2 files changed, 7 insertions(+), 3 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 1efc1c98..b42cd9c6 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 @@ -570,8 +570,10 @@ public class TicketController extends ControllerBase { @GetMapping("getTicket") public ApiResult getTicket(@Valid @RequestParam @NotNull Integer id) { Ticket ticket = ticketService.getById(id); - AppUser user = appUserService.getById(ticket.getUserId()); + AdminUser adminUser=StrUtil.equals(ticket.getUserPlatform(),Constant.FROM_ADMIN)?adminUserService.getById(ticket.getUserId()):null; + AppUser user = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_APP) ? appUserService.getById(ticket.getUserId()) : null; String areaName = ""; + if (Objects.nonNull(user)) if (user.getIsPrimary()){ areaName=StrUtil.join(",",customerService.getAreas(Arrays.stream(user.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()))); }else if (Objects.nonNull(user.getAreaId())){ @@ -617,8 +619,8 @@ public class TicketController extends ControllerBase { .setImages(getFileVOs(ticket.getImages())) .setAttachments(getFileVOs(ticket.getAttachments())) .setCreateUserId(ticket.getUserId()) - .setCreateUserName(user.getName()) - .setCreateUserAvatar(user.getAvatar()) + .setCreateUserName(Objects.nonNull(user)?user.getName():adminUser.getUserName()) + .setCreateUserAvatar(Objects.nonNull(user)?user.getAvatar():adminUser.getAvatar()) .setCreateTime(ticket.getCreateTime()) .setAreaName(areaName) .setCompanyName(device.getCustomerName()) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml index 644b8e1e..25f19304 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml @@ -36,6 +36,8 @@ FROM device d INNER JOIN t_base_device_type dt ON d.device_type=dt.device_type WHERE dt.device_state=1 AND d.device_no=#{deviceNo} + ORDER BY d.id desc + LIMIT 1