From 94936fda93922dedcd33af040035a154cc40ec5a Mon Sep 17 00:00:00 2001
From: La123123 <617330105@qq.com>
Date: Wed, 1 Apr 2026 17:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8E=E7=BE=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-admin-ui/src/api/im/user/index.ts          |  20 ++
 im-admin-ui/src/api/im/user/types.ts          |  37 ++-
 im-admin-ui/src/views/im/user/index.vue       | 211 +++++++++++++-----
 .../im/controller/ImUserLabelController.java  |  12 +
 .../java/org/dromara/im/domain/ImUser.java    |   7 +
 .../org/dromara/im/domain/bo/ImUserBo.java    |  10 +
 .../org/dromara/im/domain/vo/ImUserVo.java    |   9 +-
 .../im/service/IImUserLabelService.java       |   8 +
 .../service/impl/ImUserLabelServiceImpl.java  |  24 +-
 .../im/service/impl/ImUserServiceImpl.java    |  20 ++
 ...ImGroupMemberToImGroupMemberVoMapper.class | Bin 659 -> 659 bytes
 ...GroupMessageToImGroupMessageVoMapper.class | Bin 669 -> 669 bytes
 .../im/domain/ImGroupToImGroupVoMapper.class  | Bin 599 -> 599 bytes
 ...ateMessageToImPrivateMessageVoMapper.class | Bin 689 -> 689 bytes
 ...nsitiveWordToImSensitiveWordVoMapper.class | Bin 679 -> 679 bytes
 .../org/dromara/im/domain/ImUser.class        | Bin 9315 -> 10405 bytes
 .../im/domain/ImUserToImUserVoMapper.class    | Bin 589 -> 589 bytes
 .../domain/ImUserToImUserVoMapperImpl.class   | Bin 2514 -> 2658 bytes
 .../domain/bo/ImGroupBoToImGroupMapper.class  | Bin 488 -> 488 bytes
 ...ImGroupMemberBoToImGroupMemberMapper.class | Bin 524 -> 524 bytes
 ...GroupMessageBoToImGroupMessageMapper.class | Bin 530 -> 530 bytes
 ...ateMessageBoToImPrivateMessageMapper.class | Bin 542 -> 542 bytes
 ...nsitiveWordBoToImSensitiveWordMapper.class | Bin 536 -> 536 bytes
 .../org/dromara/im/domain/bo/ImUserBo.class   | Bin 8750 -> 9828 bytes
 .../im/domain/bo/ImUserBoToImUserMapper.class | Bin 482 -> 482 bytes
 .../bo/ImUserBoToImUserMapperImpl.class       | Bin 2641 -> 2785 bytes
 .../im/domain/bo/ImUserBo__Javadoc.json       |   2 +-
 ...ImGroupMemberVoToImGroupMemberMapper.class | Bin 590 -> 590 bytes
 ...GroupMessageVoToImGroupMessageMapper.class | Bin 598 -> 598 bytes
 .../domain/vo/ImGroupVoToImGroupMapper.class  | Bin 542 -> 542 bytes
 ...ateMessageVoToImPrivateMessageMapper.class | Bin 614 -> 614 bytes
 ...nsitiveWordVoToImSensitiveWordMapper.class | Bin 606 -> 606 bytes
 .../org/dromara/im/domain/vo/ImUserVo.class   | Bin 8757 -> 9823 bytes
 .../im/domain/vo/ImUserVoToImUserMapper.class | Bin 534 -> 534 bytes
 .../vo/ImUserVoToImUserMapperImpl.class       | Bin 2516 -> 2660 bytes
 .../im/service/impl/ImUserServiceImpl.class   | Bin 12963 -> 13659 bytes
 .../ImGroupMemberToImGroupMemberVoMapper.java |   6 +-
 ...roupMemberToImGroupMemberVoMapperImpl.java |   2 +-
 ...mGroupMessageToImGroupMessageVoMapper.java |   4 +-
 ...upMessageToImGroupMessageVoMapperImpl.java |   2 +-
 .../im/domain/ImGroupToImGroupVoMapper.java   |   4 +-
 .../domain/ImGroupToImGroupVoMapperImpl.java  |   2 +-
 ...vateMessageToImPrivateMessageVoMapper.java |   4 +-
 ...MessageToImPrivateMessageVoMapperImpl.java |   2 +-
 ...ensitiveWordToImSensitiveWordVoMapper.java |   4 +-
 ...tiveWordToImSensitiveWordVoMapperImpl.java |   2 +-
 .../im/domain/ImUserToImUserVoMapper.java     |   4 +-
 .../im/domain/ImUserToImUserVoMapperImpl.java |   6 +-
 .../domain/bo/ImGroupBoToImGroupMapper.java   |   4 +-
 .../bo/ImGroupBoToImGroupMapperImpl.java      |   2 +-
 .../ImGroupMemberBoToImGroupMemberMapper.java |   4 +-
 ...roupMemberBoToImGroupMemberMapperImpl.java |   2 +-
 ...mGroupMessageBoToImGroupMessageMapper.java |   4 +-
 ...upMessageBoToImGroupMessageMapperImpl.java |   2 +-
 ...vateMessageBoToImPrivateMessageMapper.java |   4 +-
 ...MessageBoToImPrivateMessageMapperImpl.java |   2 +-
 ...ensitiveWordBoToImSensitiveWordMapper.java |   4 +-
 ...tiveWordBoToImSensitiveWordMapperImpl.java |   2 +-
 .../im/domain/bo/ImUserBoToImUserMapper.java  |   4 +-
 .../domain/bo/ImUserBoToImUserMapperImpl.java |   6 +-
 .../ImGroupMemberVoToImGroupMemberMapper.java |   4 +-
 ...roupMemberVoToImGroupMemberMapperImpl.java |   2 +-
 ...mGroupMessageVoToImGroupMessageMapper.java |   4 +-
 ...upMessageVoToImGroupMessageMapperImpl.java |   2 +-
 .../domain/vo/ImGroupVoToImGroupMapper.java   |   4 +-
 .../vo/ImGroupVoToImGroupMapperImpl.java      |   2 +-
 ...vateMessageVoToImPrivateMessageMapper.java |   4 +-
 ...MessageVoToImPrivateMessageMapperImpl.java |   2 +-
 ...ensitiveWordVoToImSensitiveWordMapper.java |   4 +-
 ...tiveWordVoToImSensitiveWordMapperImpl.java |   2 +-
 .../im/domain/vo/ImUserVoToImUserMapper.java  |   4 +-
 .../domain/vo/ImUserVoToImUserMapperImpl.java |   6 +-
 72 files changed, 359 insertions(+), 123 deletions(-)

diff --git a/im-admin-ui/src/api/im/user/index.ts b/im-admin-ui/src/api/im/user/index.ts
index 17c213a..72095b7 100644
--- a/im-admin-ui/src/api/im/user/index.ts
+++ b/im-admin-ui/src/api/im/user/index.ts
@@ -89,3 +89,23 @@ export const getActiveUserStats = (): AxiosPromise<any> => {
     method: 'get'
   });
 };
+
+/**
+ * 获取标签列表
+ */
+export const getLabelList = (): AxiosPromise<any> => {
+  return request({
+    url: '/im/userLabel/labelOptions',
+    method: 'post'
+  });
+};
+
+/**
+ * 获取群组列表
+ */
+export const getGroupList = (): AxiosPromise<any> => {
+  return request({
+    url: '/im/userGroup/selectList',
+    method: 'post'
+  });
+};
diff --git a/im-admin-ui/src/api/im/user/types.ts b/im-admin-ui/src/api/im/user/types.ts
index f41236a..74fbf9b 100644
--- a/im-admin-ui/src/api/im/user/types.ts
+++ b/im-admin-ui/src/api/im/user/types.ts
@@ -68,7 +68,15 @@ export interface UserVO {
    */
   reason: string;
 
+  /**
+   * 标签ids
+   */
+  labelIds?: string;
 
+  /**
+   * 群组ids
+   */
+  groupIds?: string;
 }
 
 export interface UserForm extends BaseEntity {
@@ -137,10 +145,18 @@ export interface UserForm extends BaseEntity {
    */
   reason?: string;
 
+  /**
+   * 标签ids
+   */
+  labelIds?: string;
+
+  /**
+   * 群组ids
+   */
+  groupIds?: string;
 }
 
 export interface UserQuery extends PageQuery {
-
   /**
    * 用户名
    */
@@ -155,13 +171,22 @@ export interface UserQuery extends PageQuery {
    */
   createdTime?: string;
   /**
-  * 日期范围参数
-  */
+   * 日期范围参数
+   */
   params?: any;
+
+  /**
+   * 标签ids
+   */
+  labelIds?: string;
+
+  /**
+   * 群组ids
+   */
+  groupIds?: string;
 }
 
 export interface UserBanDTO {
-
   /**
    * id
    */
@@ -173,13 +198,9 @@ export interface UserBanDTO {
   reason?: string;
 }
 
-
 export interface UserUnbanDTO {
-
   /**
    * id
    */
   id?: string | number;
 }
-
-
diff --git a/im-admin-ui/src/views/im/user/index.vue b/im-admin-ui/src/views/im/user/index.vue
index 03890ed..9768cf1 100644
--- a/im-admin-ui/src/views/im/user/index.vue
+++ b/im-admin-ui/src/views/im/user/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -11,11 +10,20 @@
             <el-form-item label="用户昵称" prop="nickName">
               <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="标签" prop="labelIds">
+              <el-select v-model="queryParams.labelIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择标签" style="width: 200px">
+                <el-option v-for="item in labelOptions" :key="item.id" :label="item.labelName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="群组" prop="groupIds">
+              <el-select v-model="queryParams.groupIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择群组" style="width: 200px">
+                <el-option v-for="item in groupOptions" :key="item.id" :label="item.groupName" :value="item.id" />
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="warning" plain icon="Download" @click="handleExport"
-                v-hasPermi="['im:user:export']">导出</el-button>
+              <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['im:user:export']">导出</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -36,6 +44,31 @@
             <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
           </template>
         </el-table-column>
+        <el-table-column label="标签" align="center" prop="labelIds" width="200">
+          <template #default="scope">
+            <el-tag
+              v-for="labelId in (scope.row.labelIds || '').split(',').filter(id => id)"
+              :key="labelId"
+              size="small"
+              style="margin-right: 5px; margin-bottom: 5px;"
+            >
+              {{ getLabelNameById(labelId) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="群组" align="center" prop="groupIds" width="200">
+          <template #default="scope">
+            <el-tag
+              v-for="groupId in (scope.row.groupIds || '').split(',').filter(id => id)"
+              :key="groupId"
+              type="info"
+              size="small"
+              style="margin-right: 5px; margin-bottom: 5px;"
+            >
+              {{ getGroupNameById(groupId) }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="是否被封禁" align="center" prop="isBanned">
           <template #default="scope">
             <dict-tag :options="im_bool" :value="scope.row.isBanned" />
@@ -53,25 +86,20 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button link type="primary" v-hasPermi="['im:user:query']"
-              @click="handleDetail(scope.row)">详情</el-button>
-            <el-button v-if="scope.row.isBanned" link type="danger" v-hasPermi="['im:user:ban']"
-              @click="unbanHandle(scope.row)">解封</el-button>
-            <el-button v-else link type="danger" v-hasPermi="['im:user:ban']"
-              @click="banHandle(scope.row)">封禁</el-button>
+            <el-button link type="primary" v-hasPermi="['im:user:query']" @click="handleDetail(scope.row)">详情</el-button>
+            <el-button v-if="scope.row.isBanned" link type="danger" v-hasPermi="['im:user:ban']" @click="unbanHandle(scope.row)">解封</el-button>
+            <el-button v-else link type="danger" v-hasPermi="['im:user:ban']" @click="banHandle(scope.row)">封禁</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改用户对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
       <el-form ref="userFormRef" :model="form" :rules="rules" label-width="100px" disabled>
         <el-form-item label="用户头像" prop="headImage">
-          <image-preview v-if="form.headImageThumb" :src="form.headImageThumb" :full-src="form.headImage"
-            :width="100" :height="100" />
+          <image-preview v-if="form.headImageThumb" :src="form.headImageThumb" :full-src="form.headImage" :width="100" :height="100" />
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
           <el-input v-model="form.userName" />
@@ -80,24 +108,43 @@
           <dict-tag :options="sys_user_sex" :value="form.sex" />
         </el-form-item>
         <el-form-item label="用户昵称" prop="nickName">
-          <el-input v-model="form.nickName"  />
+          <el-input v-model="form.nickName" />
         </el-form-item>
         <el-form-item label="个性签名" prop="signature">
           <el-input v-model="form.signature" />
         </el-form-item>
         <el-form-item label="最后登录时间" prop="lastLoginTime">
-          <el-date-picker clearable v-model="form.lastLoginTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss">
-          </el-date-picker>
+          <el-date-picker clearable v-model="form.lastLoginTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"> </el-date-picker>
         </el-form-item>
         <el-form-item label="注册时间" prop="createdTime">
-          <el-date-picker clearable v-model="form.createdTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss">
-          </el-date-picker>
+          <el-date-picker clearable v-model="form.createdTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="标签" prop="labelIds">
+          <el-tag
+            v-for="labelId in (form.labelIds || '').split(',').filter(id => id)"
+            :key="labelId"
+            size="small"
+            style="margin-right: 5px; margin-bottom: 5px;"
+          >
+            {{ getLabelNameById(labelId) }}
+          </el-tag>
+        </el-form-item>
+        <el-form-item label="群组" prop="groupIds">
+          <el-tag
+            v-for="groupId in (form.groupIds || '').split(',').filter(id => id)"
+            :key="groupId"
+            type="info"
+            size="small"
+            style="margin-right: 5px; margin-bottom: 5px;"
+          >
+            {{ getGroupNameById(groupId) }}
+          </el-tag>
         </el-form-item>
         <el-form-item label="是否被封禁" prop="isBanned">
           <dict-tag :options="im_bool" :value="form.isBanned" />
         </el-form-item>
         <el-form-item v-if="form.isBanned" label="被封禁原因" prop="reason">
-          <el-input v-model="form.reason"/>
+          <el-input v-model="form.reason" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -110,7 +157,7 @@
 </template>
 
 <script setup name="User" lang="ts">
-import { listUser, getUser, ban, unban } from '@/api/im/user';
+import { listUser, getUser, ban, unban, getLabelList, getGroupList } from '@/api/im/user';
 import { UserVO, UserQuery, UserForm } from '@/api/im/user/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -123,6 +170,10 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 
+// 存储标签和群组选项
+const labelOptions = ref<any[]>([]);
+const groupOptions = ref<any[]>([]);
+
 const queryFormRef = ref<ElFormInstance>();
 const userFormRef = ref<ElFormInstance>();
 const dialog = reactive<DialogOption>({
@@ -143,8 +194,10 @@ const initFormData: UserForm = {
   createdTime: undefined,
   type: undefined,
   isBanned: undefined,
-  reason: undefined
-}
+  reason: undefined,
+  labelIds: '',
+  groupIds: ''
+};
 const data = reactive<PageData<UserForm, UserQuery>>({
   form: { ...initFormData },
   queryParams: {
@@ -152,8 +205,9 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     pageSize: 10,
     userName: undefined,
     nickName: undefined,
-    params: {
-    }
+    labelIds: [],
+    groupIds: [],
+    params: {}
   },
   rules: {}
 });
@@ -165,55 +219,69 @@ const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
 /** 查询用户列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listUser(queryParams.value);
+
+  // 转换标签和群组ID数组为逗号分隔的字符串
+  const params = { ...queryParams.value };
+  if (params.labelIds && Array.isArray(params.labelIds)) {
+    params.labelIds = params.labelIds.join(',');
+  }
+  if (params.groupIds && Array.isArray(params.groupIds)) {
+    params.groupIds = params.groupIds.join(',');
+  }
+
+  const res = await listUser(params);
   userList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-  console.log("getList")
-}
+  console.log('getList');
+};
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-  console.log("handleQuery")
-}
+  console.log('handleQuery');
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  // 清空标签和群组选择
+  queryParams.value.labelIds = [];
+  queryParams.value.groupIds = [];
   handleQuery();
-  console.log("handleQuery")
-}
+  console.log('handleQuery');
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: UserVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-  console.log("handleSelectionChange")
-}
+  console.log('handleSelectionChange');
+};
 
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
   userFormRef.value?.resetFields();
-  console.log("reset")
-}
+  console.log('reset');
+};
 
 /** 修改按钮操作 */
 const handleDetail = async (row?: UserVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getUser(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "用户信息";
-}
+  dialog.title = '用户信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
   dialog.visible = false;
-}
+};
 
 const banHandle = (user: any) => {
   ElMessageBox.prompt('封禁原因:', '确定对该用户进行封禁？', {
@@ -222,37 +290,66 @@ const banHandle = (user: any) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消'
   }).then(({ value }) => {
-    const data = { id: user.id, reason: value }
+    const data = { id: user.id, reason: value };
     ban(data).then(() => {
-      user.isBanned = true
+      user.isBanned = true;
       ElMessage.success(`用户'${user.userName}'已被封禁`);
-    })
-  })
-}
+    });
+  });
+};
 
 const unbanHandle = (user: any) => {
   ElMessageBox.confirm('确定解除该用户的封禁状态？？', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消'
   }).then(() => {
-    const data = { id: user.id }
+    const data = { id: user.id };
     unban(data).then(() => {
-      user.isBanned = false
+      user.isBanned = false;
       ElMessage.success(`用户'${user.userName}'解锁成功`);
-    })
-
-  })
-}
+    });
+  });
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('im/user/export', {
-    ...queryParams.value
-  }, `user_${new Date().getTime()}.xlsx`)
-}
+  // 转换标签和群组ID数组为逗号分隔的字符串
+  const params = { ...queryParams.value };
+  if (params.labelIds && Array.isArray(params.labelIds)) {
+    params.labelIds = params.labelIds.join(',');
+  }
+  if (params.groupIds && Array.isArray(params.groupIds)) {
+    params.groupIds = params.groupIds.join(',');
+  }
+
+  proxy?.download('im/user/export', params, `user_${new Date().getTime()}.xlsx`);
+};
+
+// 获取标签名称
+const getLabelNameById = (id: string | number) => {
+  const label = labelOptions.value.find((item) => item.id == id);
+  return label ? label.labelName : '';
+};
+
+// 获取群组名称
+const getGroupNameById = (id: string | number) => {
+  const group = groupOptions.value.find((item) => item.id == id);
+  return group ? group.groupName : '';
+};
 
+// 获取标签和群组列表
+const getLabelAndGroupList = async () => {
+  try {
+    const [labelsRes, groupsRes] = await Promise.all([getLabelList(), getGroupList()]);
+    labelOptions.value = labelsRes.data || [];
+    groupOptions.value = groupsRes.data || [];
+  } catch (error) {
+    console.error('获取标签和群组列表失败:', error);
+  }
+};
 
-onMounted(() => {
+onMounted(async () => {
+  await getLabelAndGroupList();
   getList();
 });
 </script>
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLabelController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLabelController.java
index f328f55..fb85e16 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLabelController.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLabelController.java
@@ -1,6 +1,7 @@
 package org.dromara.im.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -102,4 +103,15 @@ public class ImUserLabelController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(imUserLabelService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 获取用户分组下拉框数据
+     *
+     * @return 下拉框数据列表 (id 和 labelName)
+     */
+    @SaCheckPermission("im:userLabel:query")
+    @PostMapping("/labelOptions")
+    public R<List<Map<String, Object>>> labelOptions() {
+        return R.ok(imUserLabelService.queryLabelOptions());
+    }
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java
index e9c0270..3738518 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUser.java
@@ -1,11 +1,14 @@
 package org.dromara.im.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fhs.core.trans.vo.TransPojo;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 im_user
@@ -93,6 +96,10 @@ public class ImUser implements TransPojo {
      */
     private Integer isCustomer;
 
+    private String labelIds;
+
+    private String groupIds;
+
 
 
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
index df3ddee..e1cf2b3 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
@@ -86,4 +86,14 @@ public class ImUserBo {
      */
     private Integer isCustomer;
 
+    /**
+     * 标签 ID 列表 (逗号分隔)
+     */
+    private String labelIds;
+
+    /**
+     * 群组 ID 列表 (逗号分隔)
+     */
+    private String groupIds;
+
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
index 80132bb..6079cfa 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
@@ -2,6 +2,8 @@ package org.dromara.im.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -9,7 +11,7 @@ import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.im.domain.ImUser;
 
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -101,5 +103,10 @@ public class ImUserVo {
     @ExcelProperty(value = "被封禁原因")
     private String reason;
 
+    private String labelIds;
+
+
+    private String groupIds;
+
 
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLabelService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLabelService.java
index c340558..8c29f57 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLabelService.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLabelService.java
@@ -7,6 +7,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户分组Service接口
@@ -65,4 +66,11 @@ public interface IImUserLabelService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取用户分组下拉框数据
+     *
+     * @return 下拉框数据列表 (id 和 labelName)
+     */
+    List<Map<String, Object>> queryLabelOptions();
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLabelServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLabelServiceImpl.java
index 9124ff7..6c34271 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLabelServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLabelServiceImpl.java
@@ -126,8 +126,30 @@ public class ImUserLabelServiceImpl implements IImUserLabelService {
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+            //TODO 做一些业务上的校验，判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 获取用户分组下拉框数据
+     *
+     * @return 下拉框数据列表 (id 和 labelName)
+     */
+    @Override
+    public List<Map<String, Object>> queryLabelOptions() {
+        LambdaQueryWrapper<ImUserLabel> lqw = Wrappers.lambdaQuery();
+        lqw.select(ImUserLabel::getId, ImUserLabel::getLabelName);
+        lqw.orderByAsc(ImUserLabel::getSort);
+        List<ImUserLabel> labels = baseMapper.selectList(lqw);
+        
+        return labels.stream()
+            .map(label -> {
+                Map<String, Object> option = new java.util.HashMap<>();
+                option.put("id", label.getId());
+                option.put("labelName", label.getLabelName());
+                return option;
+            })
+            .collect(java.util.stream.Collectors.toList());
+    }
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
index 84abbf4..5fd8226 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
@@ -107,6 +107,26 @@ public class ImUserServiceImpl implements IImUserService {
         wrapper.eq(ImUser::getIsCustomer, bo.getIsCustomer());
         wrapper.like(StringUtils.isNotBlank(bo.getUserName()), ImUser::getUserName, bo.getUserName());
         wrapper.like(StringUtils.isNotBlank(bo.getNickName()), ImUser::getNickName, bo.getNickName());
+
+        // 处理标签 ID 查询，支持多个标签 ID 的 AND 匹配
+        if (StringUtils.isNotBlank(bo.getLabelIds())) {
+            String[] labelArray = bo.getLabelIds().split(",");
+            for (String label : labelArray) {
+                if (StringUtils.isNotBlank(label)) {
+                    wrapper.apply("FIND_IN_SET({0}, label_ids)", label.trim());
+                }
+            }
+        }
+
+        // 处理群组 ID 查询，支持多个群组 ID 的 AND 匹配
+        if (StringUtils.isNotBlank(bo.getGroupIds())) {
+            String[] groupArray = bo.getGroupIds().split(",");
+            for (String group : groupArray) {
+                if (StringUtils.isNotBlank(group)) {
+                    wrapper.apply("FIND_IN_SET({0}, group_ids)", group.trim());
+                }
+            }
+        }
         wrapper.orderByDesc(ImUser::getId);
         return wrapper;
     }
diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.class
index 33d317765c8c6bc78aeb3bdda14ef20521c7ed60..7875313a8b13d3f19f55ef91508003a9a65b6bd1 100644
GIT binary patch
delta 30
mcmbQtI+=CDE=DGE)5&`nl_o1NX-(!}l9+stQERdnlP3U>8VJ+?

delta 30
mcmbQtI+=CDE=DFZ%gK8fl_o1NX-(!}l9+stQERdnlP3U>SP0hu

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.class
index f55fcc915def1c0afb16139bc0948dbe354e2b92..5b2c4823701475d046d6ca84a15466d7d78dcf99 100644
GIT binary patch
delta 26
icmbQsI+u0B0Y)x!Q)@;BmeS(X;>mnWQj?!B?gRj6VF(%k

delta 26
icmbQsI+u0B0Y)w}OKV03meS(X;>mnWQj?!B?gRj6lL#FE

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupToImGroupVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupToImGroupVoMapper.class
index b3f9ba5e0691cb7b5eb1e93a0cb6a2a6bba87e1a..fdc5f392341e1e80c2a7e4de89d89de6b9c63084 100644
GIT binary patch
delta 14
Wcmcc4a-C(vG)5+K)5$X!_X7Yas0CL5

delta 14
Wcmcc4a-C(vG)5*f%gHks_X7Yawgp-M

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.class
index a78ea0925da166030fc730df9c57efe72b34b52d..604adaed3b980479e4c170d782d2358355dfa33f 100644
GIT binary patch
delta 14
WcmdnUx{-Cm8Ac{^)5+%;9|Hg=kOiFp

delta 14
WcmdnUx{-Cm8Ac{E%gN^$9|Hg=o&}%)

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.class
index 4f4208f223d11ea00a905b98cf680dd84a772810..810282d509003a85573d6eb888a4757bdbabc03d 100644
GIT binary patch
delta 14
WcmZ3^x}0^xF-9hH)5#|o?*jlQKm~aK

delta 14
WcmZ3^x}0^xF-9gc%gHAg?*jlQP6d1b

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUser.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUser.class
index c965e3dd9252245fc64a9e408d0bf39e34debd9d..0f1bd2ff1c57976af31718d2bfce2a7c2c53a24d 100644
GIT binary patch
literal 10405
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
X3<*?zkLS<ySJYCF{zm_xf06!QYbRhu

literal 9315
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

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapper.class
index 8d1d593ad4b51215f66b692efde3e7b4c2d34cf8..2867e7ddd5d19d72f3d0295530ca8400d23eb4ba 100644
GIT binary patch
delta 29
lcmX@ha+YPo1V%1%Q)@;BmeS(X;>qV2r6#`Np1hy24*-yP3O@h<

delta 29
lcmX@ha+YPo1V%11OKV03meS(X;>qV2r6#`Np1hy24*-y~3PJz?

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapperImpl.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapperImpl.class
index e51aed65c41df848f22ee2a2fe778e67643a9c1a..2c4576cd7d2bf2d5c681beba2e3faf6aa2aeccae 100644
GIT binary patch
delta 742
zcmaKp%W4!+5Qe|gmuWKHBaP7+K@=An#c4w{-ft)YMG=>71cNb?m>6ebCKty`($O)-
z2yV_J_yP$+FI-4m39iIPaN|P=A$7VtIv~n{Q|HuQ_19lj-@AY8D1P1e_zAec+qL3*
zyY6!@V3>-+AFWN_xI0vvxHjA@;xQ61%5L#DJN-Um0pnZoSEm{?lX?6^z{9QhKmG=j
z9*+X1Xe#>jqFdIXQ_$a>Q2(@BL4z5C%_;^C>Da9Z=;;-wM?L<q=KNAS8(1jjM6fH?
zr66}pe=d~!pNP-=pu|(TgY@n4jOX%GhE#G}@~nup#kZ`B-rSyQ!camj5_>=4L9{A}
zjbXb<w|?gh4DM&111xbc<=vO%=Dflp=z{QXlbo1E;eL@ar~)tL;VQwi`pvw)pVyD8
zUvQ&Uy~`V0__vDdY?u59ha=KopVT=@nPcpwpB|3W%Lz`(xyUK5a9UKK;TC7P!#PGc
zPhD0!E9g9zI`qfC^~XlPX#kPm{=0!LD{Y_+;bj@(tE>qrW~YNF9j>n9N9%YAbu&9F
zon5vGuVWLXyrLP3;S8Z2W}HjhPB$YRS#ktVNfW03N7&UtXr?TL7OztU%e)b5G_1fT
D!q|4?

delta 592
zcmaKoO)mpc6o%iK&UCceW*XE^SZJgbN@)=!G+`&Pv9wT>QXQY2`s$CkJ6nICBI&|H
zy0-KSu(Y+5l=sd|Xe?~*Irn@#=RN1G`?)Ll)OvUXFo)V*@YWZ}W7EJ^2-_$qNQqZH
zCM?Y_Qo1RYwQ4AjU70H?$PI}Xy_ZQtylZh~|30dJDm{6qP_Rd!POHPuw<HFPSo(l5
z`2)fz^9?z^4hx6;DH6)w68$e)AFVBlMkQRQ=Y#BCLR7Sj-0Gmy-|yCV{jA0jj>(CT
zbAnSc&YVugj|v@KVcwln@aBAYb1ZSwQLg>YS%k^T1T-Y6c!b1J#E?QC#t_FiBWYwX
zfq6_)QwA%@VhvMR$27N?q1M?ph1QQk%TowO?7s?YKtOdQ+JL!0P}P%}<)ZQ&;Y6~D
z&fzAE1~#Nx)wzm$Q={#sVQ->bTQa$gZMw{JkC~=bW!hmjuv5?d0}QkQ<sAuBap5#v
L;)+&kxCXufO*T+4

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.class
index f3af920e1d6092f30d129b9d0e09f7f211b205ce..a1a2011bf633e5aa2fb49ddaebf217c6054bc755 100644
GIT binary patch
delta 14
VcmaFC{DOJIOhzVi)5)_LeE}-`1q%QG

delta 14
VcmaFC{DOJIOhzU%%gM7DeE};91r7iJ

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.class
index 5b8486814ed00e1c5fb05f6dd98346924b4b2b88..d2c0ac823adbd03c9c1558aad2ccb040f02aeff1 100644
GIT binary patch
delta 14
VcmeBS>0#NhmyyZbbn<>iUjQR)1f2i?

delta 14
VcmeBS>0#NhmyyZLa`JvgUjQR|1fT!_

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.class
index 090b6f571d125383ef39dd26cfa194b9b3d4429f..7c0abab17c4219aee113414aa23b03991e8aba05 100644
GIT binary patch
delta 14
VcmbQlGKpowVMZo%)5%8}eE}p;1hoJF

delta 14
VcmbQlGKpowVMZo1%gIL>eE}q11h@bI

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.class
index f177f7e4aedb3a013697a51b9719ec9740f6bb1e..5bb0dc3e3013fbf026374bd91d936f43240104bc 100644
GIT binary patch
delta 14
VcmbQoGLL1$c}6C4)5#YZeE}vI1myq#

delta 14
VcmbQoGLL1$c}6BP%gGlReE}vW1n2+&

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.class
index 5b50b86fdfbd685f0dc55b52921077c6e06dde28..a2ce19ec96f6c8f636bfc0580427a1f87abcdc97 100644
GIT binary patch
delta 14
VcmbQiGJ|EqNk%4f)5)h9eE}sj1kC^d

delta 14
VcmbQiGJ|EqNk%3!%gLu1eE}sx1keBg

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo.class
index 4643db64bc5cb5a84ee2cc9a580525b30e3c62cb..071641c9275796f4006a1cb05e3ed0387c71e211 100644
GIT binary patch
literal 9828
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
C#O)~n

literal 8750
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%0A`Qi<3qJ|*A}zDU<o|`})<(CrB$5dK55vh*
z7hub|^onu@;YbO7c-dcYcI6dyBL#bZ4C~;fsbekdg8x1a8hjtdwxI3Bm)?!JjTc5X
z$z(K|+gL&>O5`SvQ+&fos$9+bNiD(#HR4zjoS<yeHZ3Ym$W78Ip+;R(QHx1a%rhZl
z*<RCHT$+%q9Iv=*+NC9=DdCxr!fda7T2h*jy&SKkYdWB%q$%Z@kkf3hgIbR?A)Ps1
zJ+A4Hrbv_GnH1NgYiVghesjFiu4z`wNK?i$A?w*=m9(rhA>lb*S=ThL<)kU+nUDtI
zH5!@#5bAPgoNetEH_&}_Kejb0j?%Xvbx}%K^Z>THo7RYfI9QwjHj6EE5>k||#G!l$
zQj9E-qK6^H=~nt1Jpw6#!}UBp3MolXL-TD&Df%;x`eTrK=wEabeFu^vhNwi3LrROY
zX_}sZlo3;O4m}AeE9PjJo`RI)L)ZOx8hr_hNSqQv;GmHZFX83<eithSDe3}TOr%-m
zz+wTIk8IUC;CM6G$A=gkm&6hm-z(haIO0FU_5^_s{>b@8_#emNX2(7CGIoFTQz0CZ
zo|h-_dD?&+D&>?^K3jX7Lzr$y=yP@ib!a)6%eaF3DSn(?=oIacXFDVJ-~2QjoFQ@@
z58;n;dOprTy{9vfKh|lxVYrt1`n%pAF-rK`C;#PfGhZrrcH!BF=K!9Acn;y2#G~Vx
z#Z$tw4NnozJf7)CsYdcDUwYx$f3n={WX52HAEEEbEAspDz4%k$X{4cNX6RY^!BzA_
ZdJfhEv_Hc03;Gp$DM-)LZ|JwA{udvVEIR-I

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBoToImUserMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBoToImUserMapper.class
index e26e5d0f2fe3b6e3f08cdb04fe38702ffe371a08..b9508960a03cbc40591f7f8542199a21d87c9f23 100644
GIT binary patch
delta 14
VcmaFF{D^tOWJV@))5%jAeE}*M1oHp@

delta 14
VcmaFF{D^tOWJV@4%gIw2eE}*a1oi*`

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.class
index 2f965d78e41cbebbbefaa737687a63cdb04a0417..4e25680004f57fa3684ea1e1243336b4e71bb98e 100644
GIT binary patch
delta 750
zcmaKqNoy2Q6otQ6U6nFj)zV-z3yDM=kaTO~JkO9INER+!CMrh3#3Y?g(weC4Y^$wC
z>p!?o5K3?%*$ILRe}aF(z2bS*6)g~@;NAD`aLzsV*4M6YYxAFfe)tF+C0fd_az_J3
zL&oSf1Xo9<&tAMVGIr*2EsxK5$OP-<uVwuK)sU%`{DG;7naMPNI%H-g|Bt`U4WFAK
zbIeCQ?%SZwZTq-mI2~PZH%H&yjqY7TCF*r6@A|zjW~h#Xp`ji<S&t5#_w=gB8td(Q
zk6F^i;l55Ah5`?ChV29%@<=aZd6cDMvq?55-$GRN8$G3%Ycbc$vXe2j@}eTS1nnGM
z(GP!Mcngo&%1gE-xV`P#6jvyUJ`w(E)iil3>}Lsr>EO98o>9EbKcDh<r~J**C%p1v
z)bOi~e|Is+8r5&dWry_b6wfZ!v6~I-QCEBA-KTFq$2dSg2N~oL=Q+#}N4TQZjw>?D
zaj8F{PEKVsG=FPoHc}BtLhEl4olYX61;vvZ<cqctk>-+N6#7cb1m$J?m{~i&>^A(&
zHVP@D9gM{+LaS&ohvzikWIIyk=u<oajk)zdz|IVyowNWQUL_qY@LJaX5pUoZe=B$N

delta 600
zcmaKpyGjF55QhJ=+0Ev*5=AXVK~f~as8QoJAVLBbf)<vR7RDIwSub(d`vdGdq&5f<
zEF`sHkw@@F)c@=*x|Pk$nK?7x{AbSRK({~k{`L9>U<r?{SVWCiu&bk*z#eK&Lv1oX
zkintAiqla?oegb7Jr>A0wwilxY9C^&0tEs`WN7pn!n7xha`ZxG(=QM$9u%C?%4@(t
zoi^bWz{D9NA?L7)%_2@8V$OEDx@A1^6mq*)(dSen<@J=?KkU``{jA10F39O2=MoJv
zuG~%$hQ)&>c<;@rd2{gX&oLb%TDSh@l+eq{3{+&PI7i|*1~GvlOd^Fm#xR8$OruC!
zLIG=-#U|#kg?VgafiGF4-eN$d`K!|ORe~8isM7LeMip144J4Ndy7r|O_*l6TBc16W
zp6x(yV@E0u?o|)$)$k|Er%Ps%3rc#-8=sk{SLC(JEVr@$A21pK%3Ttu;MP@ehkJVY
Hw-3M%_W4gF

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo__Javadoc.json b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo__Javadoc.json
index 1b068c0..efdbe8c 100644
--- a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo__Javadoc.json
+++ b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImUserBo__Javadoc.json
@@ -1 +1 @@
-{"doc":" 用户业务对象 im_user\n\n @author Blue\n @date 2024-12-22\n","fields":[{"name":"id","doc":" id\n"},{"name":"userName","doc":" 用户名\n"},{"name":"nickName","doc":" 用户昵称\n"},{"name":"headImage","doc":" 用户头像\n"},{"name":"headImageThumb","doc":" 用户头像缩略图\n"},{"name":"password","doc":" 密码(明文)\n"},{"name":"sex","doc":" 性别 0:男 1::女\n"},{"name":"signature","doc":" 个性签名\n"},{"name":"lastLoginTime","doc":" 最后登录时间\n"},{"name":"createdTime","doc":" 创建时间\n"},{"name":"isBanned","doc":" 是否被封禁\n"},{"name":"reason","doc":" 被封禁原因\n"},{"name":"isCustomer","doc":" 用户类型 1:普通用户 2:客服\n"}],"enumConstants":[],"methods":[],"constructors":[]}
\ No newline at end of file
+{"doc":" 用户业务对象 im_user\n\n @author Blue\n @date 2024-12-22\n","fields":[{"name":"id","doc":" id\n"},{"name":"userName","doc":" 用户名\n"},{"name":"nickName","doc":" 用户昵称\n"},{"name":"headImage","doc":" 用户头像\n"},{"name":"headImageThumb","doc":" 用户头像缩略图\n"},{"name":"password","doc":" 密码(明文)\n"},{"name":"sex","doc":" 性别 0:男 1::女\n"},{"name":"signature","doc":" 个性签名\n"},{"name":"lastLoginTime","doc":" 最后登录时间\n"},{"name":"createdTime","doc":" 创建时间\n"},{"name":"isBanned","doc":" 是否被封禁\n"},{"name":"reason","doc":" 被封禁原因\n"},{"name":"isCustomer","doc":" 用户类型 1:普通用户 2:客服\n"},{"name":"labelIds","doc":" 标签 ID 列表 (逗号分隔)\n"},{"name":"groupIds","doc":" 群组 ID 列表 (逗号分隔)\n"}],"enumConstants":[],"methods":[],"constructors":[]}
\ No newline at end of file
diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.class
index efca4085232073c5b61c6eed7946706ab5b05c93..6c22e529d71990a4e5e6250d8ddbe6e1d9da9bdb 100644
GIT binary patch
delta 14
VcmX@da*k!gUPdN!)5-f8`vEFq1!DjJ

delta 14
VcmX@da*k!gUPdM}%gOs0`vEF&1!e#M

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.class
index 857217a71100e70404721339bbc7b46cfeb44a50..a6019897747a48f163adf295513ef177cddd5f71 100644
GIT binary patch
delta 14
Wcmcb{a*bufVMZo%)5%8}CjtN~d<B63

delta 14
Wcmcb{a*bufVMZo1%gIL>CjtN~iUouK

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.class
index 8b93b40cf95eedc74bcb1f23b44ca32558359be9..654756ee54d12b9265acff3b460f01a71501fde1 100644
GIT binary patch
delta 14
VcmbQoGLL1$OhzVi)5)_Ln*k%n1g`)9

delta 14
VcmbQoGLL1$OhzU%%gM7Dn*k%#1hN1C

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.class
index bcb4f04bcc55c77ea0e3398ca9b0fab0ea931262..a1612497707b49db5262733056a9d0a0a04a2650 100644
GIT binary patch
delta 14
WcmaFH@{DD}c}6C4)5#YZrvd;ium!yU

delta 14
WcmaFH@{DD}c}6BP%gGlRrvd;iz6HPl

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.class
index 2588bc086b13a9f192b4471aeaf3b78a77ead170..67ab3a180afc0362d6a4b1ea42c256b5c9208a69 100644
GIT binary patch
delta 14
Wcmcb|a*t)hNk%4f)5)h9Cj$U1mIa>x

delta 14
Wcmcb|a*t)hNk%3!%gLu1Cj$U1qy?e?

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVo.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVo.class
index 0ed5f9e399a543f945207ee68e54c444d3742ee8..140f1f0cee13350529ac8d300226b873082bee41 100644
GIT binary patch
literal 9823
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

literal 8757
zcmc&(Yjj*y72YSAckWEyNpBlob}DU>G89DQwxQ6F(qK|zQ-Xzxy_sB+A(Odb9<}vZ
z#7BJqMT#v21$ne6RSJ{><?RC$-wHm!<-)a0tN!tqKU|9S+xMP3b7ykt3_o11m6O?L
z?{9zSwa-51%)IiSqt6jhAN?UhbyOcDpF(~L2x_`c->N6ldS)_l`S^84GA}5wDwRp)
zFBDY2blF&#LKF^CM4<*!1f5}KCleD{b4JhViPTJD0#YiI*lH#QXRgQ@*)da4U1|cn
zLnY!NGc&o8iDC*hQj?%i0nqjOj3KDSg&WOhQxe&tP^*Q^q>|H&WcPN3I#?N=GW3bT
z8GX{yE>K8iZLFx>I8~S#XNN@!by+O4dM@`7Gdsb`Qx!Umhf<$2wsHLoh2CYc=2DXx
zJzvOLtZ{{w(7Odi(|RsHWKO0s8&lk0Ij%xJl}=ou=M8IIOBGti;D%(@fNp}JOx>eU
zFE{1OZ=bakXDO7RvoQgw+!{TTF)&fBt_fIUnrTDNSe)l5bS`%*0Lq-1iGc1rh2Bf&
z!#k;G2CgsYX+iBvUGDY*u3UB%gD+4>qm_dElSY0J?X)ai=7L&F!lBTo(1pwyFqkmM
zo);-}F?$B!IcjWURlh=)uqp`EMvR4ZYZbbb)?v`xKyf(jWz9GPV*F(ay`P3`Jco+C
z{%vJ=837Dmuh8WVe7y_;)_*{u4Xjtt>^dh7*sxKdE7;KNHdvv+)+-hIphGtzqk;8T
zDRi|%H|hic8$P7aHS}RDIOvATW1u*dr6^zzU7>OIh{2=36bNjZP{`m`!Z2-+>sd#W
z3QbW8>p7+8ruxkZgcr8lU<)?tv_ff`5!5-OPaFMaCaLGIOyvQ}<nnqZpA+;C_sUz#
z=~`YnkN*SBNn0w-huv~z-AXf+3{H&9@2opu<%k5S8w!~`_SaY{ml{tS7iThNUeBj6
zF@k!BlIBc8Pp8K9aXn#dOB(3}wwVMZ23RqYHD`@%emifCt$MnENe>_2{ot{kPt5JQ
z31MZ+$M!yc{J^1Nb?*Mdb2r|CEpcqefw`Rz!6j*Cwt~jU3OaYlofOf788agrmnggC
zOH#=^7LeW0_<3*dRoP{BTx(`$boOgPWKBpKBRjBd7CY+fzT>-}=v~n__rPP==*RBb
zF}LgH<99qg_w4P*_8j@^p2HZ&+|E1ao<8bS8;|XMcy8DJzuf!K+@Twe@4o?F*JAe@
zeNgu1vjw9M06~pKz}(Gu&)s<sGMOEwjYFx7u^w60$ZpiJ3Y^Eyq@Etrvnj4ir7u5~
z!m=zb8>;82fq^ZO3p<$E>anyfLuqqn+?-BaYGjNoCs|&=oSoZR=k0}MW0<L7BR^$M
zjNqu6F|bnTNdp{8xu-07$^c_WMmZ@5Q-@kH(ICCJt5$lk9h{_sAOQk-)AlUp6!ZuB
zicI2kytGlc{TP6*1cI~+1*cuRrBbr(aF5&BN6Zk0gPmst2^`7pQ&yf5m_0K;#qk^D
zRf_YW9kMjGXen_-g3Q+1vZdzZOi;wu+m)zIQalG@lB%e%0fl1Xmw=MO1~}(EX2E7~
zDXb=nr#!;bMz}Ps<q)|%Z524Fwi|S=2E_(l3X83HEhskV(zIBRiaSE9-Cl*Z$%49W
z2#6&cSf*>RVA$k1^btZf!l_0_^Llc6Sf7;}%s;YWaCiV~JczK%8o5Fm_qTd$0ex|6
z!TfQ1eZuk5l_MN4&3ZUqn&3#>HI<E}ikz=-yfihDxN8z(@rt1;@v<QW<4*rWdDGr!
zh@MfikWCtEQ=C1b&h7CmzBO`kte(gRCo^W&xFRF7rIiqRhf-!@5(i~rJdsXiW{p%j
zWw?%jT;k$F-o*Uj2tfV_<n=60WI?CCO@^|&#aS1-E1%0}^;tWq<QfC?^9cQdei@`+
z@mc+ALGjX!H<j6HP8$h(tVq^4zSru>yqVoDXs>(IN}x@;PR~rFja+=lG^Y!*E9W1G
zE=`#u=LQe>)h@hqH*~2aMZca-kEU>w4bf|Y?sHaRX=<WR^q%fS3d>HUuw0CkvWgWc
ztZ^cRWyGQN;oPpcQWh|*a0LukIcWLQ30juzAnFs#uq_60dCvBOC1>P<^gBUI=1soW
zoCfK2EcVHv2n%}w=nUN4>Tns0;y+$LBq)Pg44)>-?A0W4(AV*s#?y8^Y<R_Z+On|W
zG2>~=!G<Rd+N$ICi}i^oi^O(8Yogfg=c$mSt@IHXx8-O%^mxoz9(cZZvVRm9yjDDI
zAA=1q7Rw(G70(twUe@9#;DL9FC)+3S(84i80bo7_&ID=#pZ@MANIYUSvIGAEma?60
zfXssgfIdw(;`1}o`dNGme$LDzI!wVsFxJry2_>{yjR?;W529!#(UPh}c%XO?HCGb#
zR3*ZT#)GJ>l4wO$BD{b+h&n5Y&aX;@$C3xp!b+l5Rf+JF^dLH=lBmBb5uRxtM5k90
zt*c6eXPpPp;!2|RRf+K0^B_92l4xU9BD}3Vh`K9@HdQ6UgWQ8?c_q=7szi9LdJwIs
zB)YaL(dX#%RB!Em4TPLc1KmB3Q_y?+ci0HI{W&$*d3PuL{J8xh(Uj+eFVGjg=%cmL
z+o@a9bETaAOWyR&wbI+!U($1>oc_z+^li1$+XslG=Sn&KP2TjKwbJt$BuLV8rJVj|
zZ~BF`((}<)q~}UG{Vm>+b4soB_K7Kbf7(3yUEaMvy;gcYW{bV&N_p>ZrLTAe=HgoE
z?bBQKe#t!g+q~(|td-ur07&{}^XPYb&wY2T^n8aXPEPMU`rGNNUX!!DR(kttB72{h
zN598=X;;)rZ{KGmJy*(?7T=fJy{~^0>FN|*O-}T5?<c?SV9$#b+DHESgFP=$Xt=lg
z2))OuLU`Z$Ui{O1%U`Aj)%OxLA0TD9>N`TK9K>qP56EgQp!yjTc!^pLP*nA+0T*bE
z76fRG7E*%@3Q15<4Y@!AS{R@KEuw}Q6p^5?8gYRJwFZC&HAQV;kRm~lT%chs3ed0?
zQ=<%uNl;Xcxj-XYBS0fsliJ9jCJAa(n_Qq#tr?(Etwn8SP>TdLt1T|jnAQr=nAWDY
zGN?_0TGcieXp`0s&?c=zZD&x21huOjF3@JJ6QIr70=1Jt3nZvhUEl(3(Nuu8XbV-9
zK?@~FRTsKINo^58Nv%s=#Goz-TBLS4Am2fpPW7~d&o)Fok#&_7aXU1evrL?zy>tic
z?c#5=57*l|ii<bsPUz~XTf9bhLGsb1;z{}%BtH#{N9pU30+bfF(cO@OlodD8J&;0l
ztH{tdAcbj<n4)_jMd*kar28N>&@-Z+?uVq%8|cRakfQV_aVqVH6hjwJ&;dw|B0&G7
z2O%|yCG<Ld6H>G2p;zf!kXpoL^f)~Psa1^7!*mc*n=ok?eH&7{C}5X;2U3UFP1CU7
zL7ieBzUDpzX@Pi(*3u)8RPj7rM2|vRDE^2S)nkwri9gdKIt-}`Ef7AtgQ0&@EJ&fZ
zs3S;q_zQ`*Xn`$;|9_%$`0cGo0zUpBMy9X}u%>*k@$>HIP;fs+>{pF_t#Mv8{Jz<T
zK^GI`z6y51KMQ~cZzlgid^RD)B%4;Q^7UDXq^oJ=6w*kjspkL%mmi^Px3GS-=3|5E
zla>%C7u&Q(^IIn570W54`W@4N7O+f#q6yi?_8QcJmI;YQdIcTRuokjRp`r=t$Mzc0
z!j=h{M|y=F)2J4)Op&4q`N;Mf(;6%jQjzp(a7>#t#WE>Hlj4{*Yf;OD+$6oCj%kY)
zvrMs~2^q_7E2%YFCL}BA)o7WzJhw5nmNory8`q01bcFDH#dY)=dJ<9{MZ_k03hP-<
zi^WBB6q1iF#D;nrlAkt-2t5NSKzaH*JqsyFw_uAs2PuS&_7pu2DNH}WW`6-vgx*AQ
zco9+q{R@HcT}X=PpkewRq^MXy=g{{d#l#SG!VBA&H&OkKwD1HJz95B!z{Vkgj8pHb
z*Ri6V{0_ju_{voh7I48z$V#mQ2g|`FyoW)$gyy-Fyu5AF5kE%T0|egvXN}j#zg2si
zrF-OU?4{OEhL9u;Z%<O<sREKz%1Nn8Y}Ij+Fj|eU#90$m(sFXP;tK93`ID<qD_W8_
z)<$0H`8#lsO*GZqM5&c`=7WYRE{ZP|AJG#yfB9yhaRNsfL>WdIK^a9ELs^Zo31u_N
z7L+w811QO(bRFST^*UJWugf%#ugm=OvgPqZ>pM%nm;4BIzQ{H}eg);nN%{%>6p9ck
UKSOzyeuG*B(r@Ya^aiQ_1&-62-T(jq

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapper.class
index afe3b0cb7945ca72fd03f2f2e72422c9dc67c1d9..67eade145a45aba584a1a931eb9f5e559b9889fb 100644
GIT binary patch
delta 14
VcmbQnGL2=!WJV@))5%jA8v!D$1d#v$

delta 14
VcmbQnGL2=!WJV@4%gIw28v!D^1e5>(

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.class
index e8badfaf698d0763ed86265b32e4616ac7ed21f7..ff3fd1f9c82695b4e0840170cc23aae58055ee6a 100644
GIT binary patch
delta 746
zcmaKqNoy2Q6otQ6)tw?;)zTO-peQO%q{}hR6G}i)LY8iXh%ucQjoocJgJaUhHpXG0
z^iS{ym>`tkLb4NFyL9RAP|vHXXn`mN@4k2Lz31GazIJ_ISNQVd<0s%WFP95%-Kx*^
zfML1~{%B>g|JqPx{Niw<fX7I{C>w=0vbfJ!z|Gb83lp`edKy0-aC<fW4_>40aVKDc
zhN1UOeQW!hJ726ZWua+9-|l`3zRGPgci+Fu{WOC$91Jt6F)y2^L+3rc_Q@KH_I$uB
z>*8=<r*%V-2Ref!fQLNN%UA_PDcN+(y22LQfj6_M95ED831x3Y+zOZEabvaty4tV3
zzN_1rWd{rFig~vrxhbz$<ed}$8s#*3EbjT3!F2FMm%Ncb(Ql;seyZOre<mL;wKsTU
zbN{a55^I$ol4Fnh+b^91tmhz`>18K}*vny#=sUwv&U1_bj&qq4404hYPEpl*r{$gH
zY^MI^@A{jze%k;lzx8(mole|93rgoS#HUFU5_9806nn}m_~8m(MAgnNy9qC|iDIf~
uhhjNP&?+UI3tWjeqmCSX^2ekRlm8>^%n;fsi_qa&T)`sGW$oYa0)7GK5_G`;

delta 595
zcmaKpO)mpc6o%hB?R47eRE1ay5+bcAiXtVUNmnAVvFt)oAEo27<8u=KfNt&lfi{v#
zETn5|Kf%(@UcGl_!o<Sno^#JV=Q-~=_r2?_GyMAX`~qMORz3XSix#l1VIzV~6a`YZ
zMqf4KztIcWmZ2Si?9h@7e)#)E>9JjHiF^SH1a`?#X;lPx?(vqS6*3xsf~eC`u+LLI
z13Jn)BTfPg9PlP&2WH9Q7Ojugtd_KjUZdx;t8?hM3uada?DAeG#Vuzt4sk?Gl$c|j
z5OHc3iU2BfRKa(rP0?-h>9#Sd_rbFD+h!3lX2#)1f`Ug#Orjg3=)o8UG0sQ|Q<%U!
zCXu7Jj5Jm;jXY*J#4M#|JPM5;g@&sTjF^8FT0ls#C7M8NfuJ*2W}1V_ZRqht6K%sy
zXbr4MwceF#o|WouM>)1+avC${Fwb3PidK=&HnV}PTJ|4c$ODvnBv8SHU2usjTKTQl
Fz&8|`Ov?ZO

diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/service/impl/ImUserServiceImpl.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/service/impl/ImUserServiceImpl.class
index fd847de95da7ad79b62a9ecb2411a3ce57b1cab1..cb360e950c602307f1cb4c07245db06fb66bef08 100644
GIT binary patch
literal 13659
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

literal 12963
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

diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java
index 62cad67..b5a4644 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImGroupMemberBoToImGroupMemberMapper;
 import org.dromara.im.domain.vo.ImGroupMemberVo;
@@ -8,8 +8,8 @@ import org.dromara.im.domain.vo.ImGroupMemberVoToImGroupMemberMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
-    uses = {ImGroupMemberBoToImGroupMemberMapper.class,ImGroupMemberVoToImGroupMemberMapper.class},
+    config = AutoMapperConfig__175.class,
+    uses = {ImGroupMemberVoToImGroupMemberMapper.class,ImGroupMemberBoToImGroupMemberMapper.class},
     imports = {}
 )
 public interface ImGroupMemberToImGroupMemberVoMapper extends BaseMapper<ImGroupMember, ImGroupMemberVo> {
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java
index 4e0f070..93f463d 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java
index 15bfc92..6119ad0 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImGroupMessageBoToImGroupMessageMapper;
 import org.dromara.im.domain.vo.ImGroupMessageVo;
@@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImGroupMessageVoToImGroupMessageMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImGroupMessageBoToImGroupMessageMapper.class,ImGroupMessageVoToImGroupMessageMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java
index 3c2bfca..8380306 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java
index 8f66d2a..af4171e 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImGroupBoToImGroupMapper;
 import org.dromara.im.domain.vo.ImGroupVo;
@@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImGroupVoToImGroupMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImGroupVoToImGroupMapper.class,ImGroupBoToImGroupMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java
index 78d60ad..7713407 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java
index 429e45d..abd3b42 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImPrivateMessageBoToImPrivateMessageMapper;
 import org.dromara.im.domain.vo.ImPrivateMessageVo;
@@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImPrivateMessageVoToImPrivateMessageMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImPrivateMessageVoToImPrivateMessageMapper.class,ImPrivateMessageBoToImPrivateMessageMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java
index 9279d52..2ceb6b7 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java
index 1295aad..f3261e7 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImSensitiveWordBoToImSensitiveWordMapper;
 import org.dromara.im.domain.vo.ImSensitiveWordVo;
@@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImSensitiveWordVoToImSensitiveWordMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImSensitiveWordBoToImSensitiveWordMapper.class,ImSensitiveWordVoToImSensitiveWordMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java
index 85b9a71..0a398b0 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java
index 3597ad2..126db9f 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java
@@ -1,6 +1,6 @@
 package org.dromara.im.domain;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.bo.ImUserBoToImUserMapper;
 import org.dromara.im.domain.vo.ImUserVo;
@@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImUserVoToImUserMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImUserVoToImUserMapper.class,ImUserBoToImUserMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java
index 2e44530..9bc471f 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
@@ -33,6 +33,8 @@ public class ImUserToImUserVoMapperImpl implements ImUserToImUserVoMapper {
         imUserVo.setType( arg0.getType() );
         imUserVo.setIsBanned( arg0.getIsBanned() );
         imUserVo.setReason( arg0.getReason() );
+        imUserVo.setLabelIds( arg0.getLabelIds() );
+        imUserVo.setGroupIds( arg0.getGroupIds() );
 
         return imUserVo;
     }
@@ -56,6 +58,8 @@ public class ImUserToImUserVoMapperImpl implements ImUserToImUserVoMapper {
         arg1.setType( arg0.getType() );
         arg1.setIsBanned( arg0.getIsBanned() );
         arg1.setReason( arg0.getReason() );
+        arg1.setLabelIds( arg0.getLabelIds() );
+        arg1.setGroupIds( arg0.getGroupIds() );
 
         return arg1;
     }
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java
index ecb1927..019e634 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroup;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java
index 1adf33e..4170865 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:57+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java
index db3df65..10e18be 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroupMember;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java
index 9b1ef3c..8bb5103 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:57+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java
index 337a812..a516500 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroupMessage;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java
index dd32931..fbfacfd 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java
index 0a82930..cd83f33 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImPrivateMessage;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java
index 2da69dd..6f28ebc 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java
index 1ce299e..d52a527 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImSensitiveWord;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java
index 447c260..85e3943 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java
index 85ebfd0..34a492f 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java
@@ -1,12 +1,12 @@
 package org.dromara.im.domain.bo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImUser;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java
index db5da1d..a636619 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
@@ -34,6 +34,8 @@ public class ImUserBoToImUserMapperImpl implements ImUserBoToImUserMapper {
         imUser.setIsBanned( arg0.getIsBanned() );
         imUser.setReason( arg0.getReason() );
         imUser.setIsCustomer( arg0.getIsCustomer() );
+        imUser.setLabelIds( arg0.getLabelIds() );
+        imUser.setGroupIds( arg0.getGroupIds() );
 
         return imUser;
     }
@@ -58,6 +60,8 @@ public class ImUserBoToImUserMapperImpl implements ImUserBoToImUserMapper {
         arg1.setIsBanned( arg0.getIsBanned() );
         arg1.setReason( arg0.getReason() );
         arg1.setIsCustomer( arg0.getIsCustomer() );
+        arg1.setLabelIds( arg0.getLabelIds() );
+        arg1.setGroupIds( arg0.getGroupIds() );
 
         return arg1;
     }
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java
index 7f61544..447e7e9 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroupMember;
 import org.dromara.im.domain.ImGroupMemberToImGroupMemberVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImGroupMemberToImGroupMemberVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java
index dd704d8..1e8a7c1 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java
index 445a3d2..a1c04f9 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroupMessage;
 import org.dromara.im.domain.ImGroupMessageToImGroupMessageVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImGroupMessageToImGroupMessageVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java
index 033073d..b90d177 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java
index ed5f019..8942ef1 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImGroup;
 import org.dromara.im.domain.ImGroupToImGroupVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImGroupToImGroupVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java
index 73fb02d..50ecb9d 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:57+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java
index 04d41ea..fce4db7 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImPrivateMessage;
 import org.dromara.im.domain.ImPrivateMessageToImPrivateMessageVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImPrivateMessageToImPrivateMessageVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java
index ff8bf43..6f32df8 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java
index 75aaf45..1fcf9e9 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImSensitiveWord;
 import org.dromara.im.domain.ImSensitiveWordToImSensitiveWordVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImSensitiveWordToImSensitiveWordVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java
index 56c9103..83a3bd0 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:05+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java
index bc3d748..f5bbf9e 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java
@@ -1,13 +1,13 @@
 package org.dromara.im.domain.vo;
 
-import io.github.linpeilie.AutoMapperConfig__169;
+import io.github.linpeilie.AutoMapperConfig__175;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.im.domain.ImUser;
 import org.dromara.im.domain.ImUserToImUserVoMapper;
 import org.mapstruct.Mapper;
 
 @Mapper(
-    config = AutoMapperConfig__169.class,
+    config = AutoMapperConfig__175.class,
     uses = {ImUserToImUserVoMapper.class},
     imports = {}
 )
diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java
index fe92ad6..72b1969 100644
--- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java
+++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2026-04-01T15:40:06+0800",
+    date = "2026-04-01T17:01:58+0800",
     comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)"
 )
 @Component
@@ -33,6 +33,8 @@ public class ImUserVoToImUserMapperImpl implements ImUserVoToImUserMapper {
         imUser.setType( arg0.getType() );
         imUser.setIsBanned( arg0.getIsBanned() );
         imUser.setReason( arg0.getReason() );
+        imUser.setLabelIds( arg0.getLabelIds() );
+        imUser.setGroupIds( arg0.getGroupIds() );
 
         return imUser;
     }
@@ -56,6 +58,8 @@ public class ImUserVoToImUserMapperImpl implements ImUserVoToImUserMapper {
         arg1.setType( arg0.getType() );
         arg1.setIsBanned( arg0.getIsBanned() );
         arg1.setReason( arg0.getReason() );
+        arg1.setLabelIds( arg0.getLabelIds() );
+        arg1.setGroupIds( arg0.getGroupIds() );
 
         return arg1;
     }