diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java
index 9e25a0a9..aabee9b3 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java
@@ -21,6 +21,9 @@ public class TicketVO {
//工单标题
private String title;
+ //工单描述
+ private String description;
+
//设备编号
private String deviceNo;
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java
index 84ad1613..98b10feb 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java
@@ -138,7 +138,7 @@ public class TicketChatService {
boolean flag = false;
Instant now = Instant.now();
for (ChatMessageDTO message : messages) {
- if (message.getId().equals(messageId)) {
+ if (StrUtil.equals(messageId,message.getId())) {
Duration duration = Duration.between(message.getCreateTime(), now);
if (duration.toMinutes() <= ticketSet.getWithdrawTimeout()) {
log.info("消息撤回 找到消息");
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml
index 52094652..9cd0f769 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml
@@ -18,6 +18,10 @@
#{userId}
+ ORDER BY FIELD
+
+ #{userId}
+