From f2957eb44fcd0c33c5bf6e247556ff1182b91a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 31 Jul 2025 17:21:30 +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 搜索消息接口优化 --- .../admin/controller/MessageController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 e9efcbd2..1a617ebb 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 @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.admin.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.mobilebroken.admin.annotation.ApiMark; import com.nflg.mobilebroken.common.constant.Constant; @@ -11,6 +12,7 @@ import com.nflg.mobilebroken.common.pojo.vo.AdminMessageVO; import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO; import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.PageUtil; +import com.nflg.mobilebroken.repository.entity.AdminUser; import com.nflg.mobilebroken.repository.entity.AppUser; import com.nflg.mobilebroken.repository.entity.AppUserApplyfor; import com.nflg.mobilebroken.repository.entity.Ticket; @@ -67,9 +69,14 @@ public class MessageController extends ControllerBase { return ApiResult.success(PageUtil.convert(datas, d -> { if (Objects.equals(d.getSource(), 0)) { Ticket ticket = ticketService.getById(d.getSourceId()); - AppUser appUser = appUserService.getById(ticket.getUserId()); d.setSourceCreateTime(ticket.getCreateTime()); - d.setSourceCreateUserName(appUser.getName()); + if (StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN)) { + AdminUser adminUser = adminUserService.getById(ticket.getUserId()); + d.setSourceCreateUserName(adminUser.getUserName()); + } else { + AppUser appUser = appUserService.getById(ticket.getUserId()); + d.setSourceCreateUserName(appUser.getName()); + } } else if (Objects.equals(d.getSource(), 1)) { AppUserApplyfor appUserApplyfor = appUserApplyforService.getById(d.getSourceId()); AppUser appUser = appUserService.getById(appUserApplyfor.getCreateBy());