fix: 修复【报警消息】报警消息配置选择人员分组，点击进去之后，看不到所选的分组

src/layout/components/Header/SwitchTenant.vue

@@ -14,7 +14,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, onMounted, watch } from 'vue';
+  import { ref, computed, onMounted } from 'vue';
   import { ElMessageBox, ElMessage } from 'element-plus';
   import { useUserStore } from '@/store/modules/user';
   import { queryListTenant } from '@/api/tenant';

src/views/message/components/PushObject.vue

@@ -92,7 +92,7 @@
     username: string;
   }
   export interface userGroupVOList {
-    userGroupId: number;
+    id: number;
     total: number;
     operatorName: string;
     operationTime: string;
@@ -213,7 +213,7 @@
       ruleForm.recipientType = props.recipientType;
     }
     if (props.userGroupList != null) {
-      ruleForm.userGroupList = props.userGroupList.map((item) => item.userGroupId);
+      ruleForm.userGroupList = props.userGroupList.map((item) => item.id);
     }
     if (props.customUserList != null) {
       ruleForm.customUserList = formatCustomUserList(props.customUserList);

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

@@ -1,12 +1,6 @@
 <template>
   <div class="group-board">
-    <el-form
-      ref="ruleFormRef"
-      style="max-width: 600px"
-      :model="ruleForm"
-      label-width="auto"
-      class="demo-ruleForm"
-    >
+    <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" label-width="auto" class="demo-ruleForm">
       <el-form-item label="分组名称：" prop="name" v-if="props.drawerTitle === '查看人员分组'">
         <el-input
           v-model="ruleForm.name"
@@ -16,12 +10,7 @@
           disabled="true"
         />
       </el-form-item>
-      <el-form-item
-        label="分组名称："
-        prop="name"
-        :rules="[{ required: true, message: '分组名称不能为空' }]"
-        v-else
-      >
+      <el-form-item label="分组名称：" prop="name" :rules="[{ required: true, message: '分组名称不能为空' }]" v-else>
         <el-input
           v-model="ruleForm.name"
           type="textarea"
@@ -32,18 +21,8 @@
           show-word-limit
         />
       </el-form-item>
-      <el-form-item
-        label="分组描述："
-        prop="description"
-        v-if="props.drawerTitle === '查看人员分组'"
-      >
-        <el-input
-          v-model="ruleForm.description"
-          type="textarea"
-          :rows="4"
-          autocomplete="off"
-          disabled="true"
-        />
+      <el-form-item label="分组描述：" prop="description" v-if="props.drawerTitle === '查看人员分组'">
+        <el-input v-model="ruleForm.description" type="textarea" :rows="4" autocomplete="off" disabled="true" />
       </el-form-item>
       <el-form-item label="分组描述：" prop="description" v-else>
         <el-input
@@ -63,8 +42,7 @@
             :key="user.id"
             :label="user.staffNo + '-' + user.realname"
             :value="user"
-          >
-          </el-option>
+          />
         </el-select>
         <p
           >共<span>&nbsp;{{ total }}&nbsp;</span>人</p
@@ -88,8 +66,7 @@
             :key="user.id"
             :label="user.staffNo + '-' + user.realname"
             :value="user"
-          >
-          </el-option>
+          />
         </el-select>
         <p
           >共<span>&nbsp;{{ total }}&nbsp;</span>人</p
@@ -125,11 +102,7 @@
       class="workShopDialog"
     >
       <!-- <SelectTree @cancel="handleCancle" @submit="handleSubmit" :selectedUser="selectedUser" /> -->
-      <PersonFilterSelection
-        @cancel="handleCancle"
-        @submit="handleSubmit"
-        :init-selected="selectedUser"
-      />
+      <PersonFilterSelection @cancel="handleCancle" @submit="handleSubmit" :init-selected="selectedUser" />
     </el-dialog>
   </div>
 </template>
@@ -145,12 +118,7 @@
   import type { FormInstance } from 'element-plus';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import { debounce } from 'lodash-es';
-  import {
-    addUserGroup,
-    addUserGroupParams,
-    modifyUserGroup,
-    modifyUserGroupParams,
-  } from '@/api/message/person-group';
+  import { addUserGroup, addUserGroupParams, modifyUserGroup, modifyUserGroupParams } from '@/api/message/person-group';
   import { FormData } from '../type';
   const useUser = useUserStore();
   const { info } = storeToRefs(useUser);
@@ -259,7 +227,7 @@
     userList.value = props.formData.userList.map((user) => ({
       id: user.userId,
       realname: user.realname,
-      staffNo: user.userNumber,
+      staffNo: user.staffNo,
     }));
     selectedUser.value = userList.value;
     ruleForm.userList = userList.value;
@@ -294,7 +262,7 @@
       userList.value = props.formData.userList.map((user) => ({
         id: user.userId,
         realname: user.realname,
-        staffNo: user.userNumber,
+        staffNo: user.staffNo,
       }));
       selectedUser.value = userList.value;
       ruleForm.userList = userList.value;

src/views/message/persongroup/type.ts

@@ -47,7 +47,7 @@ export interface FormattedNode {
 export interface FromUserList {
   userId: number;
   loginName: string;
-  userNumber: string;
+  staffNo: string;
   realname: string;
 }
 export interface FormData {