From 257318c0fdcac015ae10cea2c5fd974b65474de6 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:56:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(users):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=94=81=E5=AE=9A=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/identity/user/components/UserTable.vue  |  2 +-
 .../src/views/identity/user/hooks/useUserTable.ts | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/apps/vue/src/views/identity/user/components/UserTable.vue b/apps/vue/src/views/identity/user/components/UserTable.vue
index 31feba898..6e407b43f 100644
--- a/apps/vue/src/views/identity/user/components/UserTable.vue
+++ b/apps/vue/src/views/identity/user/components/UserTable.vue
@@ -12,7 +12,7 @@
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'userName'">
           <span>{{ record.userName }}</span>
-          <Tag v-if="!lockEnable(record)" style="margin-left: 5px" color="orange">{{ L('Lockout') }}</Tag>
+          <Tag v-if="lockEnable(record)" style="margin-left: 5px" color="orange">{{ L('Lockout') }}</Tag>
           <Tag v-if="!record.isActive" style="margin-left: 5px" color="red">{{ L('UnActived') }}</Tag>
         </template>
         <template v-if="column.key === 'phoneNumber'">
diff --git a/apps/vue/src/views/identity/user/hooks/useUserTable.ts b/apps/vue/src/views/identity/user/hooks/useUserTable.ts
index 0756a880b..40defa872 100644
--- a/apps/vue/src/views/identity/user/hooks/useUserTable.ts
+++ b/apps/vue/src/views/identity/user/hooks/useUserTable.ts
@@ -36,18 +36,15 @@ export function useUserTable() {
   const lockEnable = computed(() => {
     return (record) => {
       // 未启用锁定不显示
-      if (!record.lockoutEnabled) {
-        return false;
-      }
-      if (record.lockoutEnd) {
-        // 锁定时间高于当前时间不显示
+      if (record.lockoutEnabled === true) {
         const lockTime = new Date(record.lockoutEnd);
-        const nowTime = new Date();
-        if (lockTime > nowTime) {
-          return false;
+        if (lockTime) {
+          // 锁定时间高于当前时间不显示
+          const nowTime = new Date();
+          return lockTime > nowTime;
         }
       }
-      return true;
+      return false;
     };
   });