From f4af0fc157eefb3723e6c71b49fba0705928c54b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 25 Feb 2025 11:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A7=92=E8=89=B2=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 81c1b10c..58b75ba4 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -55,9 +55,9 @@
         {{
           Array.isArray(scope.row.UserRoleList) &&
           scope.row.UserRoleList.length > 0
-            ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join(
-                ', '
-              )
+            ? scope.row.UserRoleList.filter((item) => !item.IsUserRoleDisabled)
+                .map((item) => item.UserTypeShortName)
+                .join(', ')
             : ''
         }}
       </template>
@@ -396,13 +396,13 @@ export default {
           label: this.$t('common:button:search'),
           type: 'primary',
           emitKey: 'search',
-          icon: 'el-icon-search'
+          icon: 'el-icon-search',
         },
         {
           label: this.$t('common:button:reset'),
           type: 'primary',
           emitKey: 'reset',
-          icon: 'el-icon-refresh-left'
+          icon: 'el-icon-refresh-left',
         },
         {
           label: this.$t('common:button:new'),