github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-25 20:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 头像显示部门

Browse Source
This commit is contained in:
kuaifan 2022-11-19 17:41:36 +08:00
parent f963a00a05
commit 558d004e35
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/User.php
View File

@ -77,7 +77,7 @@ class User extends AbstractModel
public static $defaultAvatarMode = 'auto'; 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(); $userInfo = self::whereUserid($userid)->select(User::$basicField)->first();
if ($userInfo) { if ($userInfo) {
$userInfo->online = $userInfo->getOnlineStatus(); $userInfo->online = $userInfo->getOnlineStatus();
$userInfo->department_name = $userInfo->department ? UserDepartment::whereIn('id', $userInfo->department)->pluck('name')->implode(',') : '';
} }
return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []); return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
} }

1
app/Models/UserDelete.php
View File

@ -71,6 +71,7 @@ class UserDelete extends AbstractModel
$cache = $row->cache; $cache = $row->cache;
$cache = array_intersect_key($cache, array_flip(User::$basicField)); $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['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; return $cache;
} }
} }

1
resources/assets/js/components/UserAvatar.vue
View File

@ -8,6 +8,7 @@
<div slot="content" class="common-avatar-transfer"> <div slot="content" class="common-avatar-transfer">
<slot/> <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.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>{{$L('职位/职称')}}: {{user.profession || '-'}}</p>
<p v-if="user.delete_at"><strong>{{$L('删除时间')}}: {{user.delete_at}}</strong></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> <p v-else-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p>