From 6e2dc8068d5f5d7e817fdd62dc06f57261c3b58b Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Mon, 8 Apr 2024 20:12:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F):=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035488 --user=王旭 【系统设置】系统-用户组-系统用户组操作生成日志-点击名称跳转未选中对应用户组 https://www.tapd.cn/55049933/s/1490808
---
 .../views/setting/organization/usergroup/orgUserGroup.vue    | 4 +++-
 .../src/views/setting/system/usergroup/systemUserGroup.vue   | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
index 26c5a96985..62fd5cbc02 100644
--- a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
+++ b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
@@ -68,6 +68,7 @@
    * @description 系统设置-组织-用户组
    */
   import { computed, nextTick, onMounted, provide, ref, watchEffect } from 'vue';
+  import { useRouter } from 'vue-router';
 
   import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
   import AuthTable from '@/components/business/ms-user-group-comp/authTable.vue';
@@ -82,6 +83,7 @@
   import { CurrentUserGroupItem } from '@/models/setting/usergroup';
   import { AuthScopeEnum } from '@/enums/commonEnum';
 
+  const router = useRouter();
   // 注入系统层级
   provide('systemType', AuthScopeEnum.ORGANIZATION);
   const currentTable = ref('user');
@@ -156,7 +158,7 @@
     }
   });
   onMounted(() => {
-    ugLeftRef.value?.initData();
+    ugLeftRef.value?.initData(router.currentRoute.value.query.id, true);
   });
 </script>
 
diff --git a/frontend/src/views/setting/system/usergroup/systemUserGroup.vue b/frontend/src/views/setting/system/usergroup/systemUserGroup.vue
index 9cb0eb3f9a..0942d4808f 100644
--- a/frontend/src/views/setting/system/usergroup/systemUserGroup.vue
+++ b/frontend/src/views/setting/system/usergroup/systemUserGroup.vue
@@ -67,6 +67,7 @@
    * @description 系统设置-系统-用户组
    */
   import { computed, nextTick, onMounted, provide, ref, watchEffect } from 'vue';
+  import { useRouter } from 'vue-router';
 
   import MsSplitBox from '@/components/pure/ms-split-box/index.vue';
   import AuthTable from '@/components/business/ms-user-group-comp/authTable.vue';
@@ -83,7 +84,7 @@
 
   const currentTable = ref('auth');
   provide('systemType', AuthScopeEnum.SYSTEM);
-
+  const router = useRouter();
   const { t } = useI18n();
   const currentKeyword = ref('');
   const ugLeftRef = ref();
@@ -157,7 +158,7 @@
     }
   });
   onMounted(() => {
-    ugLeftRef.value?.initData();
+    ugLeftRef.value?.initData(router.currentRoute.value.query.id, true);
   });
 </script>