From a55e7d2af1a39527e0370ab0e26bfbd0937af909 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Wed, 27 Sep 2023 15:05:35 +0800
Subject: [PATCH] fix: bug#18805

---
 src/views/system/Dictionary/components/Left.vue |  2 +-
 src/views/system/User/index.vue                 | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/views/system/Dictionary/components/Left.vue b/src/views/system/Dictionary/components/Left.vue
index 646bbafb..f6ad60f6 100644
--- a/src/views/system/Dictionary/components/Left.vue
+++ b/src/views/system/Dictionary/components/Left.vue
@@ -79,7 +79,7 @@ const showSave = () => {
 const downVisible = ref(false)
 const searchValue = ref()
 const queryData = (first?: Boolean, searchName?: any) => {
-    const params = searchName ? { sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }], terms: [{ terms: [{ value: '%' + searchName + '%', termType: 'like', column: 'name' }] }] } : { sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }] }
+    const params = searchName ? { paging:false ,sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }], terms: [{ terms: [{ value: '%' + searchName + '%', termType: 'like', column: 'name' }] }] } : { sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }], paging:false  }
     getDicList(params).then((res: any) => {
         if (res.status === 200) {
             listData.value = res.result
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 2cac2e2f..d9e11509 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -29,6 +29,13 @@
                     <template #type="slotProps">
                         {{ slotProps.type?.name }}
                     </template>
+                    <template #roleList="slotProps">
+                        <j-ellipsis>
+                            {{ slotProps?.roleList?.map((item)=>{
+                                return item.name
+                            }).join(',') }}
+                        </j-ellipsis>
+                    </template>
                     <template #status="slotProps">
                         <BadgeStatus
                             :status="slotProps.status"
@@ -172,6 +179,15 @@ const columns = [
         },
         scopedSlots: true,
     },
+    {
+        title: '角色',
+        dataIndex: 'roleList',
+        key: 'roleList',
+        search:{
+            type:'string'
+        },
+         scopedSlots: true,
+    },
     {
         title: '状态',
         dataIndex: 'status',