github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 管理员通讯录显示新帐号

Browse Source
This commit is contained in:
kuaifan 2023-03-17 14:37:26 +08:00
parent 9ad018744e
commit c507251a8c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Api/UsersController.php
View File

@ -464,9 +464,8 @@ class UsersController extends AbstractController
$user = User::auth(); $user = User::auth();
// //
$columns = User::$basicField; $columns = User::$basicField;
if ($user->isAdmin()) { $columns[] = 'created_at';
$columns[] = 'identity'; $columns[] = 'identity';
}
$builder = User::select($columns); $builder = User::select($columns);
// //
$keys = Request::input('keys'); $keys = Request::input('keys');
@ -524,7 +523,7 @@ class UsersController extends AbstractController
$list = $builder->orderBy('userid')->take(Base::getPaginate(100, 10, 'take'))->get(); $list = $builder->orderBy('userid')->take(Base::getPaginate(100, 10, 'take'))->get();
} }
// //
$list->transform(function (User $userInfo) use ($state) { $list->transform(function (User $userInfo) use ($user, $state) {
$tags = []; $tags = [];
$dep = $userInfo->getDepartmentName(); $dep = $userInfo->getDepartmentName();
$dep = array_filter(explode(",", $dep), function($item) { $dep = array_filter(explode(",", $dep), function($item) {
@ -533,11 +532,16 @@ class UsersController extends AbstractController
if ($dep) { if ($dep) {
$tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . Doo::translate("负责人"); $tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . Doo::translate("负责人");
} }
if ($userInfo->isAdmin()) { if ($user->isAdmin()) {
$tags[] = Doo::translate("系统管理员"); if ($userInfo->isAdmin()) {
} $tags[] = Doo::translate("系统管理员");
if ($userInfo->isTemp()) { }
$tags[] = Doo::translate("临时帐号"); if ($userInfo->isTemp()) {
$tags[] = Doo::translate("临时帐号");
}
if ($userInfo->userid > 3 && Carbon::parse($userInfo->created_at)->isAfter(Carbon::now()->subDays(30))) {
$tags[] = Doo::translate("新帐号");
}
} }
$userInfo->tags = $tags; $userInfo->tags = $tags;
// //