From c507251a8cfd447a82b473587a4137254c0a356e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 17 Mar 2023 14:37:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=AE=A1=E7=90=86=E5=91=98=E9=80=9A?=
 =?UTF-8?q?=E8=AE=AF=E5=BD=95=E6=98=BE=E7=A4=BA=E6=96=B0=E5=B8=90=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 176861587..384587c1e 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -464,9 +464,8 @@ class UsersController extends AbstractController
         $user = User::auth();
         //
         $columns = User::$basicField;
-        if ($user->isAdmin()) {
-            $columns[] = 'identity';
-        }
+        $columns[] = 'created_at';
+        $columns[] = 'identity';
         $builder = User::select($columns);
         //
         $keys = Request::input('keys');
@@ -524,7 +523,7 @@ class UsersController extends AbstractController
             $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 = [];
             $dep = $userInfo->getDepartmentName();
             $dep = array_filter(explode(",", $dep), function($item) {
@@ -533,11 +532,16 @@ class UsersController extends AbstractController
             if ($dep) {
                 $tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . Doo::translate("负责人");
             }
-            if ($userInfo->isAdmin()) {
-                $tags[] = Doo::translate("系统管理员");
-            }
-            if ($userInfo->isTemp()) {
-                $tags[] = Doo::translate("临时帐号");
+            if ($user->isAdmin()) {
+                if ($userInfo->isAdmin()) {
+                    $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;
             //