From a04edce750451ed32be3d27610b84ac6f533a834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com>
Date: Sun, 12 Jan 2025 17:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E7=BB=84=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=85=B6=E4=BB=96=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E3=80=81=E5=8D=87=E7=BA=A7=E5=89=8D=E7=AB=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E3=80=81=E6=96=B0=E5=A2=9E=E5=90=8E=E7=AB=AFsys?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=B9=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84api=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/package.json                  |  12 +-
 snowy-admin-web/src/api/sys/userCenterApi.js  |   4 +
 .../src/components/XnGroupSelector/index.vue  | 486 ++++++++++++++++++
 .../src/components/XnOrgSelector/index.vue    |   9 +-
 .../components/XnPositionSelector/index.vue   |   3 +
 .../src/components/XnRoleSelector/index.vue   |   3 +
 .../src/components/XnUserSelector/index.vue   |   3 +
 .../java/vip/xiaonuo/sys/api/SysGroupApi.java |  16 +-
 .../vip/xiaonuo/sys/api/SysRelationApi.java   |   8 +
 .../group/param/SysGroupSelectorParam.java    |  40 ++
 .../group/provider/SysGroupApiProvider.java   |  14 +
 .../group/service/SysGroupService.java        |   8 +
 .../service/impl/SysGroupServiceImpl.java     |  15 +
 .../provider/SysRelationApiProvider.java      |   6 +
 .../controller/SysUserCenterController.java   |  25 +
 .../user/param/SysUserGroupIdListParam.java   |  36 ++
 .../modular/user/service/SysUserService.java  |   9 +
 .../user/service/impl/SysUserServiceImpl.java |  17 +
 18 files changed, 704 insertions(+), 10 deletions(-)
 create mode 100644 snowy-admin-web/src/components/XnGroupSelector/index.vue
 create mode 100644 snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/param/SysGroupSelectorParam.java
 create mode 100644 snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGroupIdListParam.java

diff --git a/snowy-admin-web/package.json b/snowy-admin-web/package.json
index be827e55..71828d0a 100644
--- a/snowy-admin-web/package.json
+++ b/snowy-admin-web/package.json
@@ -27,7 +27,7 @@
 		"@vue-office/docx": "1.6.2",
 		"@vue-office/excel": "1.7.11",
 		"@vue-office/pdf": "2.0.2",
-		"ant-design-vue": "4.2.5",
+		"ant-design-vue": "4.2.6",
 		"axios": "1.7.7",
 		"cropperjs": "1.6.2",
 		"dayjs": "1.11.13",
@@ -48,7 +48,7 @@
 		"snowflake-id": "1.1.0",
 		"sortablejs": "1.15.3",
 		"tinymce": "7.3.0",
-		"vue": "3.5.10",
+		"vue": "3.5.13",
 		"vue-cropper": "1.1.4",
 		"vue-i18n": "10.0.0",
 		"vue-router": "4.4.5",
@@ -57,7 +57,7 @@
 		"vuedraggable-es": "4.1.1"
 	},
 	"devDependencies": {
-		"@babel/eslint-parser": "7.19.1",
+		"@babel/eslint-parser": "7.25.9",
 		"@vitejs/plugin-legacy": "6.0.0",
 		"@vitejs/plugin-vue": "5.2.1",
 		"@vitejs/plugin-vue-jsx": "4.1.1",
@@ -65,10 +65,10 @@
 		"@vue/eslint-config-standard": "8.0.1",
 		"antd-less-to-css-variable": "1.0.5",
 		"autoprefixer": "10.4.20",
-		"eslint": "8.57.0",
+		"eslint": "8.57.1",
 		"eslint-config-prettier": "9.1.0",
-		"eslint-plugin-prettier": "5.0.1",
-		"eslint-plugin-vue": "9.7.0",
+		"eslint-plugin-prettier": "5.2.1",
+		"eslint-plugin-vue": "9.32.0",
 		"less": "4.2.0",
 		"postcss": "8.4.47",
 		"prettier": "3.3.3",
diff --git a/snowy-admin-web/src/api/sys/userCenterApi.js b/snowy-admin-web/src/api/sys/userCenterApi.js
index e66105ce..b60485cb 100644
--- a/snowy-admin-web/src/api/sys/userCenterApi.js
+++ b/snowy-admin-web/src/api/sys/userCenterApi.js
@@ -98,6 +98,10 @@ export default {
 	userCenterGetRoleListByIdList(data) {
 		return request('getRoleListByIdList', data)
 	},
+	// 根据id集合获取用户组集合
+	userCenterGetGroupListByIdList(data) {
+		return request('getGroupListByIdList', data)
+	},
 	// 根据id获取头像
 	userCenterGtAvatarById(data) {
 		return request('getAvatarById', data)
diff --git a/snowy-admin-web/src/components/XnGroupSelector/index.vue b/snowy-admin-web/src/components/XnGroupSelector/index.vue
new file mode 100644
index 00000000..28d4bf8a
--- /dev/null
+++ b/snowy-admin-web/src/components/XnGroupSelector/index.vue
@@ -0,0 +1,486 @@
+<template>
+	<div v-if="props.show">
+		<a-tag v-for="data in dataArray" closable @close="deleteObj(data)" :key="data.id" class="mb-1">
+			{{ data.name }}
+		</a-tag>
+		<a-button
+			type="primary"
+			size="small"
+			@click="openModal"
+			v-if="(props.radioModel ? dataArray.length !== 1 : true) && addShow"
+		>
+			<slot name="button"></slot>
+			<span v-if="!hasContent('button')">
+				<plus-outlined />
+				选择
+			</span>
+		</a-button>
+	</div>
+	<a-modal
+		v-model:open="visible"
+		title="用户组选择"
+		:width="700"
+		:mask-closable="false"
+		:destroy-on-close="true"
+		@ok="handleOk"
+		@cancel="handleClose"
+	>
+		<a-row :gutter="10">
+			<a-col :span="14">
+				<div class="table-operator xn-mb10">
+					<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
+						<a-row :gutter="24">
+							<a-col :span="12">
+								<a-form-item name="searchKey">
+									<a-input v-model:value="searchFormState.searchKey" placeholder="请输入名称" />
+								</a-form-item>
+							</a-col>
+							<a-col :span="12">
+								<a-button type="primary" class="xn-mr-10" @click="loadData()"> 查询 </a-button>
+								<a-button @click="reset()"> 重置 </a-button>
+							</a-col>
+						</a-row>
+					</a-form>
+				</div>
+				<div class="selector-table">
+					<a-table size="small" :columns="commons" bordered :data-source="tableData" :loading="pageLoading">
+						<template #title>
+							<span>待选择列表 {{ tableRecordNum }} 条</span>
+							<div v-if="!radioModel" class="xn-fdr">
+								<a-button type="dashed" size="small" @click="addAllPageRecord">添加当前数据</a-button>
+							</div>
+						</template>
+						<template #bodyCell="{ column, record }">
+							<template v-if="column.dataIndex === 'action'">
+								<a-button type="dashed" size="small" @click="addRecord(record)"><PlusOutlined /></a-button>
+							</template>
+						</template>
+					</a-table>
+				</div>
+			</a-col>
+			<a-col :span="10">
+				<div class="selector-table">
+					<a-table
+						ref="selectedTable"
+						size="small"
+						:columns="selectedCommons"
+						:data-source="selectedData"
+						:expand-row-by-click="true"
+						:loading="selectedTableListLoading"
+						bordered
+					>
+						<template #title>
+							<span>已选择: {{ selectedData.length }}</span>
+							<div v-if="!radioModel" class="xn-fdr">
+								<a-button type="dashed" danger size="small" @click="delAllRecord">全部移除</a-button>
+							</div>
+						</template>
+						<template #bodyCell="{ column, record }">
+							<template v-if="column.dataIndex === 'action'">
+								<a-button type="dashed" danger size="small" @click="delRecord(record)"><MinusOutlined /></a-button>
+							</template>
+						</template>
+					</a-table>
+				</div>
+			</a-col>
+		</a-row>
+	</a-modal>
+</template>
+
+<script setup name="groupSelector">
+	import { message } from 'ant-design-vue'
+	import { remove, isEmpty, cloneDeep } from 'lodash-es'
+	import { useSlots } from 'vue'
+	import userCenterApi from '@/api/sys/userCenterApi'
+	const dataArray = ref([])
+	const visible = ref(false)
+	const tableData = ref([])
+	const searchFormState = ref({})
+	const searchFormRef = ref()
+	const selectedTable = ref()
+	const selectedData = ref([])
+	const recordIds = ref([])
+	const selectedTableListLoading = ref(false)
+	const tableRecordNum = ref()
+	const pageLoading = ref(false)
+	// 分页相关
+	const current = ref(0) // 当前页数
+	const pageSize = ref(20) // 每页条数
+	const total = ref(0) // 数据总数
+	const slots = useSlots()
+	const hasContent = (slotName) => {
+		return !!(slots[slotName] && slots[slotName]().length > 0)
+	}
+	const props = defineProps({
+		radioModel: {
+			type: Boolean,
+			default: () => false
+		},
+		dataIsConverterFlw: {
+			type: Boolean,
+			default: () => false
+		},
+		selectorConverterKey: {
+			type: String,
+			default: () => 'USER_GROUP'
+		},
+		dataPageApi: {
+			type: Function
+		},
+		dataDetailByIdListApi: {
+			type: Function
+		},
+		// eslint-disable-next-line vue/require-prop-types
+		value: {
+			default: () => []
+		},
+		dataType: {
+			type: String,
+			default: () => 'array' // string、array
+		},
+		show: {
+			type: Boolean,
+			default: () => true
+		},
+		addShow: {
+			type: Boolean,
+			default: () => true
+		},
+		processModelId: {
+			type: String,
+			default: () => undefined
+		}
+	})
+	const emit = defineEmits(['update:value', 'onBack', 'onChange'])
+	const commons = [
+		{
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 50
+		},
+		{
+			title: '名称',
+			dataIndex: 'name',
+			ellipsis: true
+		}
+	]
+	// 选中表格的表格common
+	const selectedCommons = [
+		{
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 50
+		},
+		{
+			title: '名称',
+			dataIndex: 'name',
+			ellipsis: true
+		}
+	]
+	// 打开弹框
+	const showModel = (ids = []) => {
+		const data = goDataConverter(ids)
+		recordIds.value = data
+		getDataNameById(data)
+		openModal()
+	}
+	// 点击删除
+	const deleteObj = (obj) => {
+		// 删除显示的
+		remove(dataArray.value, (item) => item.id === obj.id)
+		// 删除缓存的
+		remove(selectedData.value, (item) => item.id === obj.id)
+		// 删除缓存的
+		remove(recordIds.value, (item) => item === obj.id)
+		const value = []
+		const showData = []
+		dataArray.value.forEach((item) => {
+			const obj = {
+				id: item.id,
+				name: item.name
+			}
+			value.push(item.id)
+			// 拷贝一份obj数据
+			const objClone = cloneDeep(obj)
+			showData.push(objClone)
+		})
+		dataArray.value = showData
+		// 判断是否做数据的转换为工作流需要的
+		const resultData = outDataConverter(value)
+		emit('update:value', resultData)
+		emit('onBack', resultData)
+	}
+	// 获取列表的api
+	const groupPage = (param) => {
+		if (typeof props.dataPageApi === 'function') {
+			return props.dataPageApi(param)
+		} else {
+			message.warning('未配置选择器API')
+			return Promise.resolve([])
+		}
+	}
+	// 获取选中列表的api
+	const groupListByIdList = (param) => {
+		if (typeof props.dataDetailByIdListApi === 'function') {
+			return props.dataDetailByIdListApi(param)
+		} else {
+			return userCenterApi.userCenterGetGroupListByIdList(param).then((data) => {
+				return Promise.resolve(data)
+			})
+		}
+	}
+	const openModal = () => {
+		if (typeof props.dataPageApi !== 'function') {
+			message.warning('未配置选择器需要的dataPageApi接口')
+			return
+		}
+		visible.value = true
+		searchFormState.value.size = pageSize.value
+		loadData()
+		if (isEmpty(recordIds.value)) {
+			return
+		}
+		const param = {
+			idList: recordIds.value
+		}
+		selectedTableListLoading.value = true
+		groupListByIdList(param)
+			.then((data) => {
+				selectedData.value = data
+			})
+			.finally(() => {
+				selectedTableListLoading.value = false
+			})
+	}
+	// 确定
+	const handleOk = () => {
+		dataArray.value = []
+		const value = []
+		const showData = []
+		selectedData.value.forEach((item) => {
+			const obj = {
+				id: item.id,
+				name: item.name
+			}
+			value.push(item.id)
+			// 拷贝一份obj数据
+			const objClone = cloneDeep(obj)
+			showData.push(objClone)
+		})
+		dataArray.value = showData
+		// 判断是否做数据的转换为工作流需要的
+		const resultData = outDataConverter(value)
+		emit('update:value', resultData)
+		emit('onBack', resultData)
+		handleClose()
+	}
+	const handleClose = () => {
+		searchFormState.value = {}
+		tableRecordNum.value = 0
+		tableData.value = []
+		current.value = 0
+		pageSize.value = 20
+		total.value = 0
+		visible.value = false
+	}
+	const loadData = () => {
+		pageLoading.value = true
+		groupPage(searchFormState.value)
+			.then((data) => {
+				current.value = data.current
+				total.value = data.total
+				// 重置、赋值
+				tableData.value = []
+				tableRecordNum.value = 0
+				tableData.value = data.records
+				if (data.records) {
+					tableRecordNum.value = data.records.length
+				} else {
+					tableRecordNum.value = 0
+				}
+			})
+			.finally(() => {
+				pageLoading.value = false
+			})
+	}
+	const reset = () => {
+		delete searchFormState.value.searchKey
+		loadData()
+	}
+	const judge = () => {
+		return !(props.radioModel && selectedData.value.length > 0)
+	}
+	// 添加记录
+	const addRecord = (record) => {
+		if (!judge()) {
+			message.warning('只可选择一条')
+			return
+		}
+		const selectedRecord = selectedData.value.filter((item) => item.id === record.id)
+		if (selectedRecord.length === 0) {
+			selectedData.value.push(record)
+		} else {
+			message.warning('该记录已存在')
+		}
+	}
+	// 添加全部
+	const addAllPageRecord = () => {
+		let newArray = selectedData.value.concat(tableData.value)
+		let list = []
+		for (let item1 of newArray) {
+			let flag = true
+			for (let item2 of list) {
+				if (item1.id === item2.id) {
+					flag = false
+				}
+			}
+			if (flag) {
+				list.push(item1)
+			}
+		}
+		selectedData.value = list
+	}
+	// 删减记录
+	const delRecord = (record) => {
+		remove(selectedData.value, (item) => item.id === record.id)
+	}
+	// 删减记录
+	const delAllRecord = () => {
+		selectedData.value = []
+	}
+	// 数据进入后转换
+	const goDataConverter = (data) => {
+		if (props.dataIsConverterFlw) {
+			const resultData = []
+			// 处理对象
+			if (!isEmpty(data.value)) {
+				const values = data.value.split(',')
+				if (values.length > 0) {
+					values.forEach((id) => {
+						resultData.push(id)
+					})
+				} else {
+					resultData.push(data.value)
+				}
+			} else {
+				// 处理数组
+				if (!isEmpty(data) && !isEmpty(data[0]) && !isEmpty(data[0].value)) {
+					const values = data[0].value.split(',')
+					for (let i = 0; i < values.length; i++) {
+						resultData.push(values[i])
+					}
+				}
+			}
+			return resultData
+		} else {
+			if (getValueType() !== 'string') {
+				return data
+			}
+			if (data.length > 1) {
+				const resultData = []
+				data.split(',').forEach((id) => {
+					resultData.push(id)
+				})
+				return resultData
+			} else {
+				return data
+			}
+		}
+	}
+	// 数据出口转换器
+	const outDataConverter = (data) => {
+		if (props.dataIsConverterFlw) {
+			data = dataArray.value
+			const obj = {}
+			let label = ''
+			let value = ''
+			for (let i = 0; i < data.length; i++) {
+				if (data.length === i + 1) {
+					label = label + data[i].name
+					value = value + data[i].id
+				} else {
+					label = label + data[i].name + ','
+					value = value + data[i].id + ','
+				}
+			}
+			obj.key = props.selectorConverterKey
+			obj.label = label
+			obj.value = value
+			obj.extJson = ''
+			return obj
+		} else {
+			if (getValueType() !== 'string') {
+				return data
+			}
+			let resultData = ''
+			data.forEach((id) => {
+				resultData = resultData + ',' + id
+			})
+			resultData = resultData.substring(1, resultData.length)
+			return resultData
+		}
+	}
+	// 获取数据类型
+	const getValueType = () => {
+		if (props.dataType) {
+			return props.dataType
+		} else {
+			if (props.radioModel) {
+				return 'string'
+			}
+			return typeof typeof props.value
+		}
+	}
+	const getDataNameById = (ids) => {
+		if (isEmpty(dataArray.value) && !isEmpty(ids)) {
+			const param = {
+				idList: recordIds.value
+			}
+			// 这里必须转为数组类型的
+			groupListByIdList(param).then((data) => {
+				dataArray.value = data
+			})
+		}
+	}
+	watch(
+		() => props.value,
+		(newValue) => {
+			if (!isEmpty(props.value)) {
+				const ids = goDataConverter(newValue)
+				recordIds.value = ids
+				getDataNameById(ids)
+			} else {
+				dataArray.value = []
+				selectedData.value = []
+			}
+		},
+		{
+			immediate: true // 立即执行
+		}
+	)
+	defineExpose({
+		showModel
+	})
+</script>
+
+<style lang="less" scoped>
+	.xn-mr-5 {
+		margin-right: 5px;
+	}
+	.xn-mr-10 {
+		margin-right: 10px;
+	}
+	.selectorTreeDiv {
+		max-height: 500px;
+		overflow: auto;
+	}
+	.ant-form-item {
+		margin-bottom: 0 !important;
+	}
+	.selector-table {
+		overflow: auto;
+		max-height: 450px;
+	}
+</style>
diff --git a/snowy-admin-web/src/components/XnOrgSelector/index.vue b/snowy-admin-web/src/components/XnOrgSelector/index.vue
index c5df64e0..e9493e8f 100644
--- a/snowy-admin-web/src/components/XnOrgSelector/index.vue
+++ b/snowy-admin-web/src/components/XnOrgSelector/index.vue
@@ -172,6 +172,10 @@
 			type: Boolean,
 			default: () => false
 		},
+		selectorConverterKey: {
+			type: String,
+			default: () => 'ORG'
+		},
 		orgTreeApi: {
 			type: Function
 		},
@@ -502,7 +506,7 @@
 					value = value + data[i].id + ','
 				}
 			}
-			obj.key = 'ORG'
+			obj.key = props.selectorConverterKey
 			obj.label = label
 			obj.value = value
 			obj.extJson = ''
@@ -548,6 +552,9 @@
 				const ids = goDataConverter(newValue)
 				recordIds.value = ids
 				getDataNameById(ids)
+			} else {
+				dataArray.value = []
+				selectedData.value = []
 			}
 		},
 		{
diff --git a/snowy-admin-web/src/components/XnPositionSelector/index.vue b/snowy-admin-web/src/components/XnPositionSelector/index.vue
index 81aa5875..2c645f9c 100644
--- a/snowy-admin-web/src/components/XnPositionSelector/index.vue
+++ b/snowy-admin-web/src/components/XnPositionSelector/index.vue
@@ -548,6 +548,9 @@
 				const ids = goDataConverter(newValue)
 				recordIds.value = ids
 				getDataNameById(ids)
+			} else {
+				dataArray.value = []
+				selectedData.value = []
 			}
 		},
 		{
diff --git a/snowy-admin-web/src/components/XnRoleSelector/index.vue b/snowy-admin-web/src/components/XnRoleSelector/index.vue
index 86c55279..0226ae07 100644
--- a/snowy-admin-web/src/components/XnRoleSelector/index.vue
+++ b/snowy-admin-web/src/components/XnRoleSelector/index.vue
@@ -576,6 +576,9 @@
 				const ids = goDataConverter(newValue)
 				recordIds.value = ids
 				getDataNameById(ids)
+			} else {
+				dataArray.value = []
+				selectedData.value = []
 			}
 		},
 		{
diff --git a/snowy-admin-web/src/components/XnUserSelector/index.vue b/snowy-admin-web/src/components/XnUserSelector/index.vue
index 3c6cb356..e2cb610a 100644
--- a/snowy-admin-web/src/components/XnUserSelector/index.vue
+++ b/snowy-admin-web/src/components/XnUserSelector/index.vue
@@ -556,6 +556,9 @@
 				const ids = goDataConverter(newValue)
 				recordIds.value = ids
 				getUserAvatarById(ids)
+			} else {
+				userObj.value = []
+				selectedData.value = []
 			}
 		},
 		{
diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysGroupApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysGroupApi.java
index 75a1bbe8..99131e21 100644
--- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysGroupApi.java
+++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysGroupApi.java
@@ -12,24 +12,26 @@
  */
 package vip.xiaonuo.sys.api;
 
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import java.util.List;
 
 /**
- * 用户Api
+ * 用户组Api
  *
  * @author xuyuxiang
  * @date 2022/6/6 11:33
  **/
 public interface SysGroupApi {
 
-
     /**
      * 获取用户组拥有人员
      *
      * @author xuyuxiang
      * @date 2022/5/13 21:00
      */
-    List<String> ownUser(String userId);
+    List<String> ownUser(String groupId);
 
     /**
      * 给用户组授权用户
@@ -38,4 +40,12 @@ public interface SysGroupApi {
      * @date 2022/8/1 18:28
      */
     void grantUser(String groupId, List<String> userIdList);
+
+    /**
+     * 获取用户组选择器
+     *
+     * @author yubaoshan
+     * @date 2025/1/12 02:36
+     */
+    Page<JSONObject> groupSelector(String searchKey, int current, int size);
 }
diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java
index fbe2fc2d..8a639b4f 100644
--- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java
+++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRelationApi.java
@@ -30,6 +30,14 @@ public interface SysRelationApi {
      **/
     List<String> getUserIdListByRoleIdList(List<String> roleIdList);
 
+    /**
+     * 根据用户组id集合获取用户组下用户id集合
+     *
+     * @author xuyuxiang
+     * @date 2022/6/6 11:43
+     **/
+    List<String> getUserIdListByGroupIdList(List<String> groupIdList);
+
     /**
      * 根据移动端菜单Id集合移除角色和移动端菜单关系
      *
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/param/SysGroupSelectorParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/param/SysGroupSelectorParam.java
new file mode 100644
index 00000000..8b13dfa8
--- /dev/null
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/param/SysGroupSelectorParam.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.sys.modular.group.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 用户组选择器参数
+ *
+ * @author yubaoshan
+ * @date 2025/1/12 02:36
+ **/
+@Getter
+@Setter
+public class SysGroupSelectorParam {
+
+    /** 当前页 */
+    @Schema(description = "当前页码")
+    private Integer current;
+
+    /** 每页条数 */
+    @Schema(description = "每页条数")
+    private Integer size;
+
+    /** 姓名关键词 */
+    @Schema(description = "姓名关键词")
+    private String searchKey;
+}
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/provider/SysGroupApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/provider/SysGroupApiProvider.java
index 00188fe7..7cfaed6b 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/provider/SysGroupApiProvider.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/provider/SysGroupApiProvider.java
@@ -12,11 +12,15 @@
  */
 package vip.xiaonuo.sys.modular.group.provider;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import vip.xiaonuo.sys.api.SysGroupApi;
 import vip.xiaonuo.sys.modular.group.param.SysGroupGrantUserParam;
 import vip.xiaonuo.sys.modular.group.param.SysGroupIdParam;
+import vip.xiaonuo.sys.modular.group.param.SysGroupSelectorParam;
 import vip.xiaonuo.sys.modular.group.service.SysGroupService;
 import java.util.List;
 
@@ -46,4 +50,14 @@ public class SysGroupApiProvider implements SysGroupApi {
         sysGroupGrantUserParam.setGrantInfoList(userIdList);
         sysGroupService.grantUser(sysGroupGrantUserParam);
     }
+
+    @SuppressWarnings("ALL")
+    @Override
+    public Page<JSONObject> groupSelector(String searchKey, int current, int size) {
+        SysGroupSelectorParam sysGroupSelectorParam = new SysGroupSelectorParam();
+        sysGroupSelectorParam.setCurrent(current);
+        sysGroupSelectorParam.setSize(size);
+        sysGroupSelectorParam.setSearchKey(searchKey);
+        return BeanUtil.toBean(sysGroupService.groupSelector(sysGroupSelectorParam), Page.class);
+    }
 }
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/SysGroupService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/SysGroupService.java
index dddb583b..bc3a2a1b 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/SysGroupService.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/SysGroupService.java
@@ -108,4 +108,12 @@ public interface SysGroupService extends IService<SysGroup> {
      * @date 2024/12/21 01:25
      */
     void grantUser(SysGroupGrantUserParam sysGroupGrantUserParam);
+
+    /**
+     * 获取用户组选择器
+     *
+     * @author yubaoshan
+     * @date 2024/12/21 01:25
+     */
+    Page<SysGroup> groupSelector(SysGroupSelectorParam sysGroupSelectorParam);
 }
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/impl/SysGroupServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/impl/SysGroupServiceImpl.java
index d1c27fdf..43194d38 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/impl/SysGroupServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/group/service/impl/SysGroupServiceImpl.java
@@ -171,4 +171,19 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
             return sysRelation;
         }).collect(Collectors.toList()));
     }
+
+    @Override
+    public Page<SysGroup> groupSelector(SysGroupSelectorParam sysGroupSelectorParam) {
+        LambdaQueryWrapper<SysGroup> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        // 只查询部分字段，排掉extJson
+        lambdaQueryWrapper.select(SysGroup::getId, SysGroup::getName, SysGroup::getSortCode, SysGroup::getRemark);
+        lambdaQueryWrapper.orderByAsc(SysGroup::getSortCode);
+        // 如果查询条件为空，则直接查询
+        if (!ObjectUtil.isAllEmpty(sysGroupSelectorParam.getSearchKey())) {
+            if (ObjectUtil.isNotEmpty(sysGroupSelectorParam.getSearchKey())) {
+                lambdaQueryWrapper.like(SysGroup::getName, sysGroupSelectorParam.getSearchKey());
+            }
+        }
+        return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
+    }
 }
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java
index aee8022f..465e16c3 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/relation/provider/SysRelationApiProvider.java
@@ -47,6 +47,12 @@ public class SysRelationApiProvider implements SysRelationApi {
                 SysRelationCategoryEnum.SYS_USER_HAS_ROLE.getValue());
     }
 
+    @Override
+    public List<String> getUserIdListByGroupIdList(List<String> groupIdList) {
+        return sysRelationService.getRelationObjectIdListByTargetIdListAndCategory(groupIdList,
+                SysRelationCategoryEnum.SYS_USER_HAS_GROUP.getValue());
+    }
+
     @Override
     public void removeRoleHasMobileMenuRelation(List<String> targetIdList) {
         sysRelationService.remove(new LambdaQueryWrapper<SysRelation>().in(SysRelation::getTargetId, targetIdList)
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
index c46c62d1..fab0d88e 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.sys.modular.group.entity.SysGroup;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.position.entity.SysPosition;
 import vip.xiaonuo.sys.modular.role.entity.SysRole;
@@ -325,4 +326,28 @@ public class SysUserCenterController {
     public CommonResult<List<SysRole>> getRoleListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) {
         return CommonResult.data(sysUserService.getRoleListByIdList(sysUserIdListParam));
     }
+
+    /**
+     * 根据id集合获取用户组集合
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @Operation(summary = "根据id集合获取用户组集合")
+    @PostMapping("/sys/userCenter/getGroupListByIdList")
+    public CommonResult<List<SysGroup>> getGroupListByIdList(@RequestBody @Valid SysUserGroupIdListParam sysUserGroupIdListParam) {
+        return CommonResult.data(sysUserService.getGroupListByIdList(sysUserGroupIdListParam));
+    }
+
+    /**
+     * 根据id获取头像
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @Operation(summary = "根据id获取头像")
+    @PostMapping("/sys/userCenter/getAvatarById")
+    public CommonResult<String> getAvatarById(@RequestBody @javax.validation.Valid SysUserIdParam sysUserIdParam) {
+        return CommonResult.data(sysUserService.getAvatarById(sysUserIdParam));
+    }
 }
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGroupIdListParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGroupIdListParam.java
new file mode 100644
index 00000000..56366a86
--- /dev/null
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGroupIdListParam.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.sys.modular.user.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 用户组id集合参数
+ *
+ * @author yubaoshan
+ * @date 2025/1/12 02:36
+ **/
+@Getter
+@Setter
+public class SysUserGroupIdListParam {
+
+    /** id集合 */
+    @Schema(description = "id集合")
+    @NotNull(message = "idList不能为空")
+    private List<String> idList;
+}
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
index 8e214db4..09617a68 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
+import vip.xiaonuo.sys.modular.group.entity.SysGroup;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.position.entity.SysPosition;
 import vip.xiaonuo.sys.modular.role.entity.SysRole;
@@ -470,6 +471,14 @@ public interface SysUserService extends IService<SysUser> {
      **/
     List<SysPosition> getPositionListByIdList(SysUserIdListParam sysUserIdListParam);
 
+    /**
+     * 根据id集合获取用户组集合
+     *
+     * @author yubaoshan
+     * @date 2025/1/12 02:36
+     */
+    List<SysGroup> getGroupListByIdList(SysUserGroupIdListParam sysUserGroupIdListParam);
+
     /**
      * 根据id集合获取角色集合
      *
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
index 04a28c1e..71963542 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
@@ -79,6 +79,8 @@ import vip.xiaonuo.mobile.api.MobileButtonApi;
 import vip.xiaonuo.mobile.api.MobileMenuApi;
 import vip.xiaonuo.sys.core.enums.SysBuildInEnum;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
+import vip.xiaonuo.sys.modular.group.entity.SysGroup;
+import vip.xiaonuo.sys.modular.group.service.SysGroupService;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.org.service.SysOrgService;
 import vip.xiaonuo.sys.modular.position.entity.SysPosition;
@@ -174,6 +176,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     private MobileButtonApi mobileButtonApi;
 
+    @Resource
+    private SysGroupService sysGroupService;
+
     @Override
     public SysLoginUser getUserById(String id) {
         SysUser sysUser = this.getById(id);
@@ -1565,6 +1570,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysPositionService.list(lambdaQueryWrapper);
     }
 
+    @Override
+    public List<SysGroup> getGroupListByIdList(SysUserGroupIdListParam sysUserGroupIdListParam) {
+        if (ObjectUtil.isEmpty(sysUserGroupIdListParam.getIdList())) {
+            return CollectionUtil.newArrayList();
+        }
+        LambdaQueryWrapper<SysGroup> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        // 查询部分字段
+        lambdaQueryWrapper.select(SysGroup::getId, SysGroup::getName, SysGroup::getRemark, SysGroup::getSortCode)
+                .in(SysGroup::getId, sysUserGroupIdListParam.getIdList()).orderByAsc(SysGroup::getSortCode);
+        return sysGroupService.list(lambdaQueryWrapper);
+    }
+
     @Override
     public List<SysRole> getRoleListByIdList(SysUserIdListParam sysUserIdListParam) {
         if (ObjectUtil.isEmpty(sysUserIdListParam.getIdList())) {