Merge remote-tracking branch 'upstream/master'

src/store/modules/user.ts

@@ -48,6 +48,10 @@ export const useUserStore = defineStore({
     getUserInfo(): any {
       return this.info;
     },
+    /** 获取角色类型，可能为多个 */
+    getRoleTypes(): string[] {
+      return this.info.roleType.split(',');
+    },
   },
   actions: {
     setTenantId(tenantId: number) {

src/views/system/role/role.vue

@@ -62,12 +62,14 @@
   import { columns } from './columns';
   import { FileAddOutlined, SearchOutlined } from '@vicons/antd';
   import CreateDrawer from './CreateDrawer.vue';
+  import { useUserStore } from '@/store/modules/user';
 
   const message = ElMessage;
   const tableRef = ref();
   const createDrawerRef = ref();
   const drawerTitle = ref('添加角色');
   const treeData = ref([]);
+  const userStore = useUserStore();
 
   const params = reactive({
     roleName: '',
@@ -131,6 +133,10 @@
   }
 
   function handleDelete(record: Recordable) {
+    if (userStore.getRoleTypes.includes(String(record.roleId))) {
+      message.error('不能删除自己的角色');
+      return;
+    }
     delRole({ roleId: record.roleId }).then(() => {
       message.success('删除成功');
       reloadTable();