From 0b7ea880fa1d4ab97d0f3b9febc4894a2e7c40f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Mon, 26 Aug 2024 11:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AD=97=E5=85=B8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/type/index.ts |  4 ++--
 src/views/system/dict/index.vue   | 11 +++++++----
 src/views/system/tenant/index.vue | 11 +++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/api/system/dict/type/index.ts b/src/api/system/dict/type/index.ts
index 8925ed2..27906ff 100644
--- a/src/api/system/dict/type/index.ts
+++ b/src/api/system/dict/type/index.ts
@@ -62,9 +62,9 @@ export function optionselect(): AxiosPromise<DictTypeVO[]> {
 }
 
 // 同步租户字典
-export function asyncTenantDict(tenantId?: string) {
+export function syncTenantDict(tenantId?: string | number) {
   return request({
-    url: '/system/dict/type/asyncTenantDict',
+    url: '/system/dict/type/syncTenantDict',
     method: 'get',
     params: { tenantId }
   });
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 5ce537d..09d67cc 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -50,7 +50,7 @@
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasRole="['superadmin']" type="success" plain icon="Refresh" @click="handleAsyncTenantDict">同步租户字典</el-button>
+            <el-button v-if="userId === 1" type="success" plain icon="Refresh" @click="handleSyncTenantDict">同步租户字典</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -112,11 +112,14 @@
 
 <script setup name="Dict" lang="ts">
 import useDictStore from '@/store/modules/dict';
-import { listType, getType, delType, addType, updateType, refreshCache ,asyncTenantDict} from '@/api/system/dict/type';
+import { listType, getType, delType, addType, updateType, refreshCache , syncTenantDict} from '@/api/system/dict/type';
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types';
+import useUserStore from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -243,9 +246,9 @@ const handleRefreshCache = async () => {
   useDictStore().cleanDict();
 };
 /**同步租户字典*/
-const handleAsyncTenantDict = async () => {
+const handleSyncTenantDict = async () => {
   await proxy?.$modal.confirm('确认要同步所有租户字典吗？');
-  let res = await asyncTenantDict();
+  let res = await syncTenantDict();
   proxy?.$modal.msgSuccess(res.msg);
 };
 onMounted(() => {
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 336d548..619bbf0 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -76,7 +76,7 @@
               </el-button>
             </el-tooltip>
             <el-tooltip content="同步字典" placement="top">
-              <el-button v-hasRole="['superadmin']" link type="primary" icon="Refresh" @click="handleAsyncTenantDict(scope.row)"></el-button>
+              <el-button v-if="userId === 1" link type="primary" icon="Refresh" @click="handleSyncTenantDict(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button v-hasPermi="['system:tenant:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
@@ -148,10 +148,13 @@ import { listTenant, getTenant, delTenant, addTenant, updateTenant, changeTenant
 import { selectTenantPackage } from '@/api/system/tenantPackage';
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types';
 import { TenantPkgVO } from '@/api/system/tenantPackage/types';
-import { asyncTenantDict } from '@/api/system/dict/type';
+import { syncTenantDict } from '@/api/system/dict/type';
+import useUserStore from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const userStore = useUserStore();
+const userId = ref(userStore.userId);
 const tenantList = ref<TenantVO[]>([]);
 const packageList = ref<TenantPkgVO[]>([]);
 const buttonLoading = ref(false);
@@ -336,11 +339,11 @@ const handleSyncTenantPackage = async (row: TenantVO) => {
 };
 
 /**同步租户字典*/
-const handleAsyncTenantDict = async (row: TenantVO) => {
+const handleSyncTenantDict = async (row: TenantVO) => {
   try {
     await proxy?.$modal.confirm('是否确认同步租户套餐租户编号为"' + row.tenantId + '"的字典数据吗？');
     loading.value = true;
-    await asyncTenantDict(row.tenantId);
+    await syncTenantDict(row.tenantId);
     await getList();
     proxy?.$modal.msgSuccess('同步成功');
   } catch {