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 cedcf456..e89bda54 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<TicketInfoVO> 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
     </select>
 
     <select id="getDeviceTypeCqmList" resultType="com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO">