From 1cf5a24c26da7249f08aef9c5f80d3a7eb9edc08 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 10 Apr 2023 10:48:45 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2=E7=A6=BB=E8=81=8C=E4=BC=9A?=
 =?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/UsersController.php             | 9 +++++++--
 resources/assets/js/components/UserInput.vue             | 8 +++++++-
 .../assets/js/pages/manage/components/CheckinExport.vue  | 2 +-
 .../assets/js/pages/manage/components/TaskExport.vue     | 2 +-
 resources/assets/sass/components/user-input.scss         | 6 ++++++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 231383fc3..4825b0939 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -450,7 +450,7 @@ class UsersController extends AbstractController
      *
      * @apiParam {Object} keys          搜索条件
      * - keys.key                           昵称、拼音、邮箱关键字
-     * - keys.disable                       0-排除禁止（默认），1-仅禁止，2-含禁止
+     * - keys.disable                       0-排除离职（默认），1-仅离职，2-含离职
      * - keys.bot                           0-排除机器人（默认），1-仅机器人，2-含机器人
      * - keys.project_id                    在指定项目ID
      * - keys.no_project_id                 不在指定项目ID
@@ -527,7 +527,12 @@ class UsersController extends AbstractController
         if (in_array($sorts['az'], ['asc', 'desc'])) {
             $builder->orderBy('az', $sorts['az']);
         } else {
-            $builder->orderBy('bot');
+            if (intval($keys['disable']) == 2) {
+                $builder->orderBy('disable_at');
+            }
+            if (intval($keys['bot']) == 2) {
+                $builder->orderBy('bot');
+            }
         }
         //
         if (Request::exists('page')) {
diff --git a/resources/assets/js/components/UserInput.vue b/resources/assets/js/components/UserInput.vue
index 4821fd382..799ad4fa4 100755
--- a/resources/assets/js/components/UserInput.vue
+++ b/resources/assets/js/components/UserInput.vue
@@ -37,6 +37,7 @@
                 <div class="user-input-option">
                     <div class="user-input-avatar"><EAvatar class="avatar" :src="item.userimg"/></div>
                     <div v-if="item.bot" class="taskfont user-input-bot">&#xe68c;</div>
+                    <div v-if="item.disable_at" class="user-input-disable">[{{$L('离职')}}]</div>
                     <div class="user-input-nickname">{{ item.nickname }}</div>
                     <div class="user-input-userid">ID: {{ item.userid }}</div>
                 </div>
@@ -105,6 +106,10 @@
                 type: Boolean,
                 default: false
             },
+            showDisable: {
+                type: Boolean,
+                default: false
+            },
         },
         data() {
             return {
@@ -190,7 +195,8 @@
                                 project_id: this.projectId,
                                 no_project_id: this.noProjectId,
                                 dialog_id: this.dialogId,
-                                bot: this.showBot ? 2 : 0,
+                                bot: this.showBot && key ? 2 : 0,
+                                disable: this.showDisable && key ? 2 : 0,
                             },
                             take: 50
                         },
diff --git a/resources/assets/js/pages/manage/components/CheckinExport.vue b/resources/assets/js/pages/manage/components/CheckinExport.vue
index cc3cd9a3f..a51c991a7 100644
--- a/resources/assets/js/pages/manage/components/CheckinExport.vue
+++ b/resources/assets/js/pages/manage/components/CheckinExport.vue
@@ -5,7 +5,7 @@
         :mask-closable="false">
         <Form ref="export" :model="formData" label-width="auto" @submit.native.prevent>
             <FormItem :label="$L('导出成员')">
-                <UserInput v-model="formData.userid" :multiple-max="100" :placeholder="$L('请选择成员')"/>
+                <UserInput v-model="formData.userid" :multiple-max="100" show-disable :placeholder="$L('请选择成员')"/>
                 <div class="form-tip">{{$L('每次最多选择导出100个成员')}}</div>
             </FormItem>
             <FormItem :label="$L('签到日期')">
diff --git a/resources/assets/js/pages/manage/components/TaskExport.vue b/resources/assets/js/pages/manage/components/TaskExport.vue
index 832b8de40..c0883c59a 100644
--- a/resources/assets/js/pages/manage/components/TaskExport.vue
+++ b/resources/assets/js/pages/manage/components/TaskExport.vue
@@ -5,7 +5,7 @@
         :mask-closable="false">
         <Form ref="exportTask" :model="formData" label-width="auto" @submit.native.prevent>
             <FormItem :label="$L('导出成员')">
-                <UserInput v-model="formData.userid" :multiple-max="100" :placeholder="$L('请选择成员')"/>
+                <UserInput v-model="formData.userid" :multiple-max="100" show-disable :placeholder="$L('请选择成员')"/>
                 <div class="form-tip">{{$L('每次最多选择导出100个成员')}}</div>
             </FormItem>
             <FormItem :label="$L('时间范围')">
diff --git a/resources/assets/sass/components/user-input.scss b/resources/assets/sass/components/user-input.scss
index 883745298..099921041 100755
--- a/resources/assets/sass/components/user-input.scss
+++ b/resources/assets/sass/components/user-input.scss
@@ -41,6 +41,12 @@
             margin-right: -6px;
             color: $primary-color;
         }
+        .user-input-disable {
+            font-size: 12px;
+            margin-left: 10px;
+            margin-right: -6px;
+            color: #ff0000;
+        }
         .user-input-nickname {
             margin-left: 10px;
             flex: 1;