diff --git a/app/chat/controller/MessageController.php b/app/chat/controller/MessageController.php
index 977d0c5..0bdf46a 100644
--- a/app/chat/controller/MessageController.php
+++ b/app/chat/controller/MessageController.php
@@ -218,7 +218,13 @@ class MessageController extends ApiController
             }
             if($session['chat_type'] == 2) {
                 if($lastMsg) {
-                    $chat_user = Db::name('chat_user')->where(['user_id' => $lastMsg['from_id']])->field('nick_name,avatar')->find();
+                    $chat_user = Db::name('chat_user')->where(['user_id' => $lastMsg['from_id']])->field('type')->find();
+                    // 如果是用户
+                    if($chat_user['type'] == 1) {
+                        $chat_user = Db::name('tb_user_info')->where(['id' => $lastMsg['from_id']])->field('nick_name,head_img as avatar')->find();
+                    }else {
+                        $chat_user = Db::name('sys_user')->where(['id' => $lastMsg['from_id']])->field('nick_name,avatar')->find();
+                    }
                 }
             }
             $msg = '';