diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java
index d0537838..b9c2604c 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java
@@ -67,7 +67,7 @@ public class MessageController extends ControllerBase {
     private StringRedisTemplate stringRedisTemplate;
 
     @Resource
-    private IDictionaryItemTranslateService dictionaryItemTranslateService;
+    private IDictionaryItemService dictionaryItemService;
 
     /**
      * 搜索消息
@@ -78,7 +78,7 @@ public class MessageController extends ControllerBase {
     @ApiMark(moduleName = "消息管理", apiName = "搜索消息")
     public ApiResult<PageData<AdminMessageVO>> searchMessages(@Valid @RequestBody AdminMessageSearchRequest request) {
         IPage<AdminMessageVO> datas = adminMessageService.search(AdminUserUtil.getUserId(), request);
-        List<DictionaryItemTranslateVO> translates = dictionaryItemTranslateService.getAllByDictionaryCode("Prompt", MultilingualUtil.getLanguage());
+        List<DictionaryItem> translates = dictionaryItemService.getListByDictionaryCode("Prompt", MultilingualUtil.getLanguage());
         return ApiResult.success(PageUtil.convert(datas, d -> {
             if (Objects.equals(d.getSource(), 0)) {
                 Ticket ticket = ticketService.getById(d.getSourceId());
@@ -121,18 +121,24 @@ public class MessageController extends ControllerBase {
                     }
                 }
             }
-            d.setTypeDesc(translates.stream()
-                    .filter(t -> StrUtil.equals(t.getDictionaryItemName(), MessageType.findByValue(d.getType()).getDescription()))
-                    .findFirst()
-                    .map(DictionaryItemTranslateVO::getValue)
-                    .orElse(MessageType.findByValue(d.getType()).getDescription())
-            );
+            MessageType mt = MessageType.findByValue(d.getType());
+            if(Objects.nonNull(mt)) {
+                d.setTypeDesc(translates.stream()
+                        .filter(t -> StrUtil.equals(t.getName(), mt.getDescription()))
+                        .findFirst()
+                        .map(DictionaryItem::getValue)
+                        .orElse(mt.getDescription())
+                );
+            }
+            MessageSubType mst = MessageSubType.findByValue(d.getSubType());
+            if(Objects.nonNull(mst)) {
             d.setSubTypeDesc(translates.stream()
-                    .filter(t -> StrUtil.equals(t.getDictionaryItemName(), MessageSubType.findByValue(d.getSubType()).getDescription()))
-                    .findFirst()
-                    .map(DictionaryItemTranslateVO::getValue)
-                    .orElse(MessageSubType.findByValue(d.getSubType()).getDescription())
-            );
+                        .filter(t -> StrUtil.equals(t.getName(), mst.getDescription()))
+                        .findFirst()
+                        .map(DictionaryItem::getValue)
+                        .orElse(mst.getDescription())
+                );
+            }
             return d;
         }));
     }