bug fix

src/components/shared/message/MessageList.vue

@@ -40,7 +40,10 @@
             <el-icon><close /></el-icon>
           </div> -->
         </div>
-        <div class="p-base" :style="{ height: isFromMyLeader ? 'calc(100% - 221px)' : 'calc(100% - 111px)' }">
+        <div
+          class="p-base"
+          :style="{ height: isFromMyLeader && !isFromSystem ? 'calc(100% - 221px)' : 'calc(100% - 111px)' }"
+        >
           <!-- <pre
             class="full-h radius-base p-extra-base scroll-y-auto message-info-content"
             @click="onContentClick"
@@ -67,7 +70,7 @@
             </div>
           </div>
         </div>
-        <div v-if="isFromMyLeader" class="p-base" style="padding-top: 0">
+        <div v-if="isFromMyLeader && !isFromSystem" class="p-base" style="padding-top: 0">
           <div class="p-base radius-base overflow-hidden msg-content-box">
             <div style="height: calc(100% - 18px)" class="scroll-y-auto">
               <content-edit-able

src/modules/analysis/personnel-statistics/components/StatisticsPersonnel.vue

@@ -357,7 +357,17 @@ const sortByCutGroup = (prop: string, order: string) => {
       newArr.push(arr[groupNodeIndexes[i]])
       targetIndex = groupNodeIndexes[i]
       if (i == groupNodeIndexes.length - 1) {
-        newArr.push(...arr.slice(targetIndex + 1))
+        let subArr2 = arr.slice(targetIndex + 1)
+        subArr2.sort((a: any, b: any) => {
+          if (typeof a[prop] === 'string') {
+            let aa = a[prop] || '',
+              bb = b[prop] || ''
+            return order === 'ascending' ? aa.localeCompare(bb) : bb.localeCompare(aa)
+          } else {
+            return order === 'ascending' ? a[prop] - b[prop] : b[prop] - a[prop]
+          }
+        })
+        newArr.push(...subArr2)
       }
     }
   }