From 289bbc7d6cf3c2991f66ce3729b5749a9d870432 Mon Sep 17 00:00:00 2001
From: truthhun <1272881215@qq.com>
Date: Tue, 27 Jun 2023 10:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pages/admin/user/list.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/web/pages/admin/user/list.vue b/web/pages/admin/user/list.vue
index 739bbee..63805bd 100644
--- a/web/pages/admin/user/list.vue
+++ b/web/pages/admin/user/list.vue
@@ -138,7 +138,9 @@ export default {
           size: parseInt(this.$route.query.size) || 10,
           ...parseQueryIntArray(this.$route.query, ['group_id', 'status']),
         }
-
+        if (this.groups.length === 0) {
+          await this.listGroup()
+        }
         // 这里要执行下初始化，避免数据请求回来了，但是表格字段还没初始化，导致列表布局错乱
         await this.initTableListFields()
         this.listUser()
@@ -148,7 +150,6 @@ export default {
   async created() {
     await this.initSearchForm()
     await this.initTableListFields()
-    await this.listGroup()
     await this.initSearchForm() // 请求完成用户组数据之后再初始化下搜索表单，因为下拉枚举需要用到用户组数据
   },
   methods: {
@@ -159,6 +160,11 @@ export default {
         let users = res.data.user || []
         users.map((item) => {
           item.username_html = genLinkHTML(item.username, `/user/${item.id}`)
+          let groups = (item.group_id || []).map((id) => {
+            let group = this.groups.find((group) => group.id === id)
+            return group ? group.title : ''
+          })
+          item.group = groups.join(', ')
         })
         this.users = users
         this.total = res.data.total
@@ -330,6 +336,11 @@ export default {
           fixed: 'left',
           type: 'html',
         },
+        {
+          prop: 'group',
+          label: '用户组',
+          width: 150,
+        },
         { prop: 'doc_count', label: '文档', width: 80, type: 'number' },
         { prop: 'credit_count', label: '积分', width: 100, type: 'number' },
         { prop: 'follow_count', label: '关注', width: 80, type: 'number' },