Parcourir la source

fix: 修复是否系统用户判断

qindao il y a 1 an
Parent
commit
ed65e9da4c
2 fichiers modifiés avec 12 ajouts et 2 suppressions
  1. 3 1
      src/utils/useTargetTenantIdSetting.ts
  2. 9 1
      src/views/system/user/user.vue

+ 3 - 1
src/utils/useTargetTenantIdSetting.ts

@@ -31,8 +31,10 @@ export function useTargetTenantIdSetting() {
     }
     return localStorage.getItem(fullKey);
   }
+
+  // 系统租户
   const sysTenantId = getValue() || userStore.info.tenantId?.toString();
-  const isSysTenant = sysTenantId !== SYS_TENANT_ID.toString();
+  const isSysTenant = sysTenantId === SYS_TENANT_ID.toString();
 
   return { setValue, getValue, isSysTenant };
 }

+ 9 - 1
src/views/system/user/user.vue

@@ -78,7 +78,7 @@
             <el-space v-if="scope.row.roleType !== RoleTypeEnum.SUPER_ADMIN">
               <el-button type="primary" :icon="Edit" text @click="handleEdit(scope.row)" />
               <el-button type="primary" :icon="Delete" text @click="handleDelete(scope.row.id)"  />
-              <el-button type="primary" v-if="(!isSysTenant) || (isSysTenant && scope.row.roleType !== RoleTypeEnum.TENANT_ADMIN) " text @click="handleResetCode(scope.row)">重置密码</el-button>
+              <el-button type="primary" v-if="visibleRestPassBtn(scope.row.roleType) " text @click="handleResetCode(scope.row)">重置密码</el-button>
             </el-space>
           </template>
         </el-table-column>
@@ -228,6 +228,14 @@
       });
   }
 
+  /* 是否能重置密码 */
+  const visibleRestPassBtn = (type: RoleTypeEnum): boolean => {
+    if (isSysTenant || (!isSysTenant && type !== RoleTypeEnum.TENANT_ADMIN)) {
+      return true
+    }
+    return false;
+  }
+
   onMounted(async () => {
     loadPageData();
     getAllDepartments().then((res) => {