From 7b794574cb67333104d91d27930fb55bb2f7e741 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 2 Nov 2023 18:33:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E8=87=AA=E5=B7=B1=E4=B8=8D=E8=83=BD=E6=94=B9?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1f9d3f8f..d13e9bd1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -33,6 +33,7 @@ import useUserStore from '@/store/modules/user';
 import { DataNode } from 'ant-design-vue/lib/tree';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 const { getDict } = useDictStore();
+const userStore = useUserStore();
 
 /**字典数据 */
 let dict: {
@@ -341,7 +342,7 @@ function fnModalVisibleByVive(userId: string | number) {
       modalState.from.roleIds = roleIds;
       modalState.from.postIds = postIds;
       // 头像解析
-      modalState.from.avatar = useUserStore().fnAvatar(modalState.from.avatar);
+      modalState.from.avatar = userStore.fnAvatar(modalState.from.avatar);
       modalState.title = '用户信息';
       modalState.visibleByView = true;
     } else {
@@ -974,8 +975,15 @@ onMounted(() => {
             {{ record.dept?.deptName }}
           </template>
           <template v-if="column.key === 'status'">
+            <DictTag
+              v-if="
+                record.userId === '1' || record.userName === userStore.userName
+              "
+              :options="dict.sysNormalDisable"
+              :value="record.status"
+            />
             <a-switch
-              v-if="record.userId !== '1'"
+              v-else
               v-perms:has="['system:user:edit']"
               v-model:checked="record.status"
               checked-value="1"
@@ -985,11 +993,6 @@ onMounted(() => {
               size="small"
               @change="fnRecordStatus(record)"
             />
-            <DictTag
-              v-else
-              :options="dict.sysNormalDisable"
-              :value="record.status"
-            />
           </template>
           <template v-if="column.key === 'userId'">
             <a-space :size="8" align="center" v-if="record.userId !== '1'">