From b81c2fcbe256352e84258a6a0c993d8265007813 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 4 Aug 2022 00:24:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=94=A8=E6=88=B7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/gridTable/tableBody.vue | 2 +-
 frontend/src/views/system/user/index.vue        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/gridTable/tableBody.vue b/frontend/src/components/gridTable/tableBody.vue
index f34a63a077..cc07576985 100644
--- a/frontend/src/components/gridTable/tableBody.vue
+++ b/frontend/src/components/gridTable/tableBody.vue
@@ -14,7 +14,7 @@ export default {
     const { children = [] } = context;
     if (!columns?.length) return children;
         children.forEach(ele => {
-            if (columns.includes(ele.componentOptions.propsData.prop)) {
+            if (columns.includes(ele.componentOptions?.propsData?.prop)) {
                 nodes.push(ele)
             }
         })
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 8b8c47ef42..a677aa3a4f 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -378,8 +378,9 @@ export default {
     pluginLoaded()
       .then((res) => {
         this.isPluginLoaded = res.success && res.data;
-        if (this.isPluginLoaded) {
-          // this.searchConfig.components.push(...this.extraFilterComponents);
+        if (!this.isPluginLoaded) {
+          this.checkedColumnNames = this.checkedColumnNames.filter(ele => !['dept', 'roles'].includes(ele))
+          this.columnNames = this.columnNames.filter(ele => !['dept', 'roles'].includes(ele.props))
         }
         this.canLoadDom = true;
       })
@@ -448,6 +449,9 @@ export default {
       this.checkedColumnNames = val
         ? columnOptions.map((ele) => ele.props)
         : [];
+      if (!this.isPluginLoaded) {
+          this.checkedColumnNames = this.checkedColumnNames.filter(ele => !['dept', 'roles'].includes(ele))
+        }
       this.isIndeterminate = false;
     },
     handleCheckedColumnNamesChange(value) {