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());