From 558d004e355481f7518e8fd1df443d41742d85b6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 19 Nov 2022 17:41:36 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/User.php                           | 3 ++-
 app/Models/UserDelete.php                     | 1 +
 resources/assets/js/components/UserAvatar.vue | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 14c276781..8cfdc6199 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -77,7 +77,7 @@ class User extends AbstractModel
     public static $defaultAvatarMode = 'auto';
 
     // 基本信息的字段
-    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'userimg', 'az', 'pinyin', 'line_at', 'disable_at'];
+    public static $basicField = ['userid', 'email', 'nickname', 'profession', 'department', 'userimg', 'az', 'pinyin', 'line_at', 'disable_at'];
 
     /**
      * 更新数据校验
@@ -478,6 +478,7 @@ class User extends AbstractModel
         $userInfo = self::whereUserid($userid)->select(User::$basicField)->first();
         if ($userInfo) {
             $userInfo->online = $userInfo->getOnlineStatus();
+            $userInfo->department_name = $userInfo->department ? UserDepartment::whereIn('id', $userInfo->department)->pluck('name')->implode(',') : '';
         }
         return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
     }
diff --git a/app/Models/UserDelete.php b/app/Models/UserDelete.php
index 3c9803d48..a3d9dfeac 100644
--- a/app/Models/UserDelete.php
+++ b/app/Models/UserDelete.php
@@ -71,6 +71,7 @@ class UserDelete extends AbstractModel
         $cache = $row->cache;
         $cache = array_intersect_key($cache, array_flip(User::$basicField));
         $cache['delete_at'] = $row->created_at->format($row->dateFormat ?: 'Y-m-d H:i:s');
+        $cache['department_name'] = $cache['department'] ? UserDepartment::whereIn('id', $cache['department'])->pluck('name')->implode(',') : '';
         return $cache;
     }
 }
diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index c34139fb3..94e04b9d1 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -8,6 +8,7 @@
         <div slot="content" class="common-avatar-transfer">
             <slot/>
             <p>{{$L('昵称')}}: {{user.nickname}}<em v-if="user.delete_at" class="deleted no-dark-content">{{$L('已删除')}}</em><em v-else-if="user.disable_at" class="disabled no-dark-content">{{$L('已离职')}}</em></p>
+            <p>{{$L('部门')}}: {{user.department_name || '-'}}</p>
             <p>{{$L('职位/职称')}}: {{user.profession || '-'}}</p>
             <p v-if="user.delete_at"><strong>{{$L('删除时间')}}: {{user.delete_at}}</strong></p>
             <p v-else-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p>