From bc063e624c7fd15657354df9c2eafdea1012ebd0 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 14 Feb 2025 23:01:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system/user):=20=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=8E=92=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20ID=20=E5=88=97=E8=A1=A8=E5=8F=82=E6=95=B0=E4=B8=BA?=
 =?UTF-8?q?=20roleId=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=90=8E=E7=AB=AF=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=20roleId=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/type.ts                   | 2 +-
 src/components/UserSelect/index.vue       | 4 ++--
 src/views/system/role/RoleAssignModal.vue | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index e6b18e4..c245a58 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -38,7 +38,7 @@ export interface UserQuery {
   deptId?: string
   sort: Array<string>
   userIds?: Array<string>
-  excludeUserIds?: Array<string>
+  roleId?: string
 }
 export interface UserPageQuery extends UserQuery, PageQuery {}
 
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index d757cb8..ad95436 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -94,13 +94,13 @@ const emit = defineEmits<{
 interface Props {
   multiple?: boolean
   value: string | string[]
-  excludeValue?: string[]
+  roleId?: string
 }
 
 // 查询表单
 const queryForm = reactive<UserQuery>({
   sort: ['t1.createTime,desc', 't1.id,desc'],
-  excludeUserIds: props.excludeValue,
+  roleId: props.roleId,
 })
 
 // 用户列表
diff --git a/src/views/system/role/RoleAssignModal.vue b/src/views/system/role/RoleAssignModal.vue
index dc7cd27..42e97c9 100644
--- a/src/views/system/role/RoleAssignModal.vue
+++ b/src/views/system/role/RoleAssignModal.vue
@@ -9,14 +9,14 @@
     @before-ok="save"
     @close="reset"
   >
-    <UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :exclude-value="excludeUsers" @select-user="onSelectUser" />
+    <UserSelect v-if="visible" ref="UserSelectRef" v-model:value="selectedUsers" :role-id="dataId" @select-user="onSelectUser" />
   </a-modal>
 </template>
 
 <script setup lang="ts">
 import { Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
-import { assignToUsers, listRoleUserId } from '@/apis/system/role'
+import { assignToUsers } from '@/apis/system/role'
 
 const emit = defineEmits<{
   (e: 'save-success'): void
@@ -27,7 +27,6 @@ const { width } = useWindowSize()
 const dataId = ref('')
 const visible = ref(false)
 const selectedUsers = ref<string[]>([])
-const excludeUsers = ref<string[]>([])
 
 // 用户选择回调
 const onSelectUser = (value: string[]) => {
@@ -63,9 +62,6 @@ const save = async () => {
 // 打开
 const onOpen = async (id: string) => {
   dataId.value = id
-  // 初始化选择的用户
-  const { data } = await listRoleUserId(id)
-  excludeUsers.value = data
   selectedUsers.value = []
   visible.value = true
 }