From ea9de2c135a821ee82ea735c99c0d6b689f926ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 23 May 2026 12:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/MessageController.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) 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> searchMessages(@Valid @RequestBody AdminMessageSearchRequest request) { IPage datas = adminMessageService.search(AdminUserUtil.getUserId(), request); - List translates = dictionaryItemTranslateService.getAllByDictionaryCode("Prompt", MultilingualUtil.getLanguage()); + List 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; })); }