Merge branch 'wyf-dev' into 'all'

feat: 人员分组回填改为userNumber

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

src/views/message/components/PushObject.vue

@@ -219,7 +219,7 @@
   const formatCustomUserList = (customList: customUserList[]): SelectedFilterPersonInfo[] => {
     return customList.map((item) => ({
       id: item.userId,
-      staffNo: item.userLoginName,
+      staffNo: item.userNumber,
       nickname: item.userNickname,
     }));
   };

src/views/message/reportmessage/class.ts

@@ -118,12 +118,12 @@ export const toReportMessage = (form: reportMessage, receivedData: finalReportMe
   form.userGroupList = receivedData.userGroupList?.map((user: any) => user.id);
   form.designatedUserList = receivedData.designatedUserList.map((user: any) => ({
     id: user.userId,
-    staffNo: user.userId,
+    staffNo: user.userNumber,
     nickname: user.userNickname,
   }));
   form.customUserList.value = receivedData.customUserList.map((user: any) => ({
     id: user.userId,
-    staffNo: user.userId,
+    staffNo: user.userNumber,
     nickname: user.userNickname,
   }));
   form.recipientType = receivedData.recipientType;
@@ -181,7 +181,7 @@ export const toReportMessage = (form: reportMessage, receivedData: finalReportMe
       tempconfig['customUserList'] = config.customUserList.map((user: any) => {
         return {
           id: user.userId,
-          staffNo: user.userId,
+          staffNo: user.userNumber,
           nickname: user.userNickname,
         };
       });