From a160b2a471bdb65c01cf5ad09c107e03f09be7fb Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 1 Dec 2024 01:52:29 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E8=81=8C=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php  |  4 +++-
 app/Http/Controllers/Api/UsersController.php   |  3 ++-
 resources/assets/js/pages/manage/messenger.vue | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index d8248df36..dfc303166 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -134,7 +134,9 @@ class DialogController extends AbstractController
                     if (str_contains($key, "@")) {
                         $query->where("email", "like", "%{$key}%");
                     } else {
-                        $query->where("nickname", "like", "%{$key}%")->orWhere("pinyin", "like", "%{$key}%");
+                        $query->where("nickname", "like", "%{$key}%")
+                            ->orWhere("pinyin", "like", "%{$key}%")
+                            ->orWhere("profession", "like", "%{$key}%");
                     }
                 })->orderBy('userid')
                 ->take(20 - count($list))
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 9990721fd..2cbc29d44 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -520,7 +520,8 @@ class UsersController extends AbstractController
             } else {
                 $builder->where(function($query) use ($keys) {
                     $query->where("nickname", "like", "%{$keys['key']}%")
-                        ->orWhere("pinyin", "like", "%{$keys['key']}%");
+                        ->orWhere("pinyin", "like", "%{$keys['key']}%")
+                        ->orWhere("profession", "like", "%{$keys['key']}%");
                 });
             }
         }
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index c6100bfde..f2bd54519 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -114,7 +114,7 @@
                                             </template>
                                             <div class="last-text">
                                                 <em v-if="formatMsgEmojiDesc(dialog.last_msg)">{{formatMsgEmojiDesc(dialog.last_msg)}}</em>
-                                                <span>{{$A.getMsgSimpleDesc(dialog.last_msg)}}</span>
+                                                <span>{{$A.getMsgSimpleDesc(dialog.last_msg) || showProfessionDesc(dialog.dialog_user)}}</span>
                                             </div>
                                         </template>
                                         <div v-if="dialog.silence" class="taskfont last-silence">&#xe7d7;</div>
@@ -469,8 +469,13 @@ export default {
         },
 
         contactsList() {
+            const {contactsKey} = this;
             const list = [];
-            this.contactsFilter.some(user => {
+            this.contactsFilter.some(data => {
+                const user = $A.cloneJSON(data);
+                if (contactsKey && $A.strExists(user.profession, contactsKey)) {
+                    user.tags.push(user.profession)
+                }
                 let az = user.az ? user.az.toUpperCase() : "#";
                 let item = list.find(item => item.az == az);
                 if (item) {
@@ -998,6 +1003,13 @@ export default {
             return null;
         },
 
+        showProfessionDesc(dialog_user) {
+            if (dialog_user) {
+                return `[${dialog_user.profession}]`
+            }
+            return ''
+        },
+
         lastMsgReadDone(data) {
             if ($A.isJson(data)) {
                 const {userid, percentage} = data;