From ce7eff5675ce074c43a4e230a36f0da1c738ebb5 Mon Sep 17 00:00:00 2001
From: Lin222 <linwumingshi@gmail.com>
Date: Wed, 21 Feb 2024 15:10:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):=20:?=
 =?UTF-8?q?sparkles:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E3=80=81=E6=98=AF=E5=90=A6=E8=B6=85=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/admin/user/index.vue          | 52 ++++++++++++++-----
 .../controller/admin/param/UserSearch.java    |  8 +++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/front/src/views/admin/user/index.vue b/front/src/views/admin/user/index.vue
index 3a385b9a..8aa9d9f4 100644
--- a/front/src/views/admin/user/index.vue
+++ b/front/src/views/admin/user/index.vue
@@ -2,10 +2,24 @@
   <div class="app-container">
     <el-form :inline="true" :model="searchFormData" class="demo-form-inline" size="mini">
       <el-form-item label="UserId">
-        <el-input v-model="searchFormData.id" :clearable="true" style="width: 250px;" />
+        <el-input v-model="searchFormData.id" :clearable="true" style="width: 250px;"/>
       </el-form-item>
       <el-form-item :label="$t('loginAccount')">
-        <el-input v-model="searchFormData.username" :clearable="true" style="width: 250px;" />
+        <el-input v-model="searchFormData.username" :clearable="true" style="width: 250px;"/>
+      </el-form-item>
+      <el-form-item :label="$t('status')">
+        <el-select v-model="searchFormData.status" :clearable="true">
+          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
+            {{ item.label }}
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('isSuperAdmin')">
+        <el-select v-model="searchFormData.isSuperAdmin" :clearable="true">
+          <el-option v-for="item in isSuperAdminOptions" :key="item.value" :label="item.label" :value="item.value">
+            {{ item.label }}
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="onSearch">{{ $t('search') }}</el-button>
@@ -70,7 +84,7 @@
         width="120"
       >
         <template slot-scope="scope">
-          <time-tooltip :time="scope.row.gmtCreate" />
+          <time-tooltip :time="scope.row.gmtCreate"/>
         </template>
       </el-table-column>
       <el-table-column
@@ -79,7 +93,9 @@
       >
         <template slot-scope="scope">
           <div v-if="!isSelf(scope.row.id)">
-            <el-link :underline="false" type="primary" @click="onAllocateProject(scope.row)">{{ $t('AdminUser.allocateProject') }}</el-link>
+            <el-link :underline="false" type="primary" @click="onAllocateProject(scope.row)">
+              {{ $t('AdminUser.allocateProject') }}
+            </el-link>
             <el-link :underline="false" type="primary" @click="onUserUpdate(scope.row)">{{ $t('update') }}</el-link>
             <el-popconfirm
               v-if="scope.row.source === getEnums().SOURCE.REGISTER || scope.row.source === getEnums().SOURCE.BACKEND"
@@ -140,13 +156,13 @@
           prop="username"
           :label="$t('loginAccount')"
         >
-          <el-input v-model="dialogFormData.username" :placeholder="$t('loginAccount')" />
+          <el-input v-model="dialogFormData.username" :placeholder="$t('loginAccount')"/>
         </el-form-item>
         <el-form-item
           prop="nickname"
           :label="$t('nickname')"
         >
-          <el-input v-model="dialogFormData.nickname" :placeholder="$t('suggestUseRealName')" />
+          <el-input v-model="dialogFormData.nickname" :placeholder="$t('suggestUseRealName')"/>
         </el-form-item>
         <el-form-item
           prop="isSuperAdmin"
@@ -184,7 +200,8 @@
               <el-radio :label="Role.admin">{{ $t('admin') }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <project-select ref="projectSelect" :on-ok="onAllocateProjectOk" :on-cancel="() => chooseProjectShow = false" />
+          <project-select ref="projectSelect" :on-ok="onAllocateProjectOk"
+                          :on-cancel="() => chooseProjectShow = false"/>
         </el-form>
       </div>
     </el-dialog>
@@ -196,12 +213,23 @@ import TimeTooltip from '@/components/TimeTooltip'
 import ProjectSelect from '@/components/ProjectSelect'
 
 export default {
-  components: { TimeTooltip, ProjectSelect },
+  components: {TimeTooltip, ProjectSelect},
   data() {
     return {
+      statusOptions: [
+        {value: 0, label: $t('disable')},
+        {value: 1, label: $t('normal')},
+        {value: 2, label: $t('inactive')}
+      ],
+      isSuperAdminOptions: [
+        {value: 0, label: $t('no')},
+        {value: 1, label: $t('yes')}
+      ],
       searchFormData: {
         id: '',
         username: '',
+        status: '',
+        isSuperAdmin: '',
         pageIndex: 1,
         pageSize: 10
       },
@@ -218,10 +246,10 @@ export default {
       },
       dialogFormRules: {
         username: [
-          { required: true, message: $t('notEmpty'), trigger: 'blur' }
+          {required: true, message: $t('notEmpty'), trigger: 'blur'}
         ],
         nickname: [
-          { required: true, message: $t('notEmpty'), trigger: 'blur' }
+          {required: true, message: $t('notEmpty'), trigger: 'blur'}
         ]
       },
       currentUserId: 0,
@@ -244,7 +272,7 @@ export default {
       })
     },
     onRestPwd(row) {
-      this.post('/admin/user/password/reset', { id: row.id }, resp => {
+      this.post('/admin/user/password/reset', {id: row.id}, resp => {
         this.alert($t('resetPasswordSuccess', resp.data), $t('resetSuccess'))
       })
     },
@@ -274,7 +302,7 @@ export default {
     onAllocateProject(row) {
       this.currentUserId = row.id
       this.currentUserNick = row.nickname
-      this.get('/admin/user/getUserProjectIds', { userId: row.id }, resp => {
+      this.get('/admin/user/getUserProjectIds', {userId: row.id}, resp => {
         const projectIds = resp.data
         this.chooseProjectShow = true
         this.$nextTick(() => {
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/admin/param/UserSearch.java b/server/server-web/src/main/java/cn/torna/web/controller/admin/param/UserSearch.java
index 7ebe5338..9b7ad947 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/admin/param/UserSearch.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/admin/param/UserSearch.java
@@ -18,4 +18,12 @@ public class UserSearch extends PageParam {
 
     @Condition(ignoreEmptyString = true, operator = Operator.like)
     private String username;
+
+    /** 用户状态 0：禁用，1：启用(正常)，2：重设密码(未激活) */
+    @Condition(operator = Operator.eq)
+    private Byte status;
+
+    /** 是否是超级管理员, 数据库字段：is_super_admin */
+    @Condition(operator = Operator.eq)
+    private Byte isSuperAdmin;
 }
-- 
Gitee