Merge branch 'all-v4-qindao' into 'all-v4'

fix: 修复人员分组由nickname改成realname与推送对象自定义，选择人员页面搜索失效bug

See merge request skyeye/skyeye_frontend/skyeye-admin!296

src/router/full-routes.ts

@@ -284,7 +284,6 @@ const fullRoutes: AppRouteRecordRaw[] = [
     ]
   },
 
-
   /**
    * 消息管理
    */
@@ -419,8 +418,6 @@ const fullRoutes: AppRouteRecordRaw[] = [
     ]
   },
 
-
-
   /**
    * 系统管理 （只有超管可见）
    */
@@ -507,8 +504,8 @@ const fullRoutes: AppRouteRecordRaw[] = [
   },
 
   /**
- * 异常页面
- */
+  * 异常页面
+  */
   {
     path: '/exception',
     name: 'Exception',

src/views/message/persongroup/components/GroupBoard.vue

@@ -258,7 +258,7 @@
     // }));
     userList.value = props.formData.userList.map((user) => ({
       id: user.userId,
-      nickname: user.nickname,
+      realname: user.realname,
       staffNo: user.userNumber,
     }));
     selectedUser.value = userList.value;
@@ -293,7 +293,7 @@
       // }));
       userList.value = props.formData.userList.map((user) => ({
         id: user.userId,
-        nickname: user.nickname,
+        realname: user.realname,
         staffNo: user.userNumber,
       }));
       selectedUser.value = userList.value;

src/views/message/persongroup/hook/usePersonGroupFilterList.ts

@@ -9,13 +9,13 @@ import { ref } from 'vue';
 
 export const usePersonGroupFilterList = () => {
   const FILTER_TYPES = [
-    { type: 'nickname', label: '姓名' },
+    { type: 'realname', label: '姓名' },
     { type: 'staffNo', label: '工号' },
     { type: 'deptName', label: '部门' },
   ];
 
   // 复用输入框类型及标签
-  const personFilterType = ref({ type: 'nickname', label: '姓名' });
+  const personFilterType = ref({ type: 'realname', label: '姓名' });
   // 输入框绑定数据
   const personFilterValue = ref<string>();
   // 查询参数
@@ -31,7 +31,7 @@ export const usePersonGroupFilterList = () => {
       pageSize: 10,
       queryParam: {}
     };
-    personFilterParams.value[personFilterType.value.type] = personFilterValue.value;
+    personFilterParams.value.queryParam[personFilterType.value.type] = personFilterValue.value;
     const res = await queryPersonFilterList(personFilterParams.value);
     personFilterList.value = res;
     // 如果有返回且搜索到则添加选中标记

src/views/message/persongroup/type.ts

@@ -48,7 +48,7 @@ export interface FromUserList {
   userId: number;
   loginName: string;
   userNumber: string;
-  nickname: string;
+  realname: string;
 }
 export interface FormData {
   description?: string;