Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts

@@ -117,11 +117,9 @@ export class MessageBoxComponent
       searchMessageSearchType: [MessageSearchType.Name]
     });
 
-    this.messageRetrieveList$ = this.store
+    this.messageRetrieveList$ = this.store.pipe(
-      .pipe(
+      select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList)
-        select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList)
+    );
-      )
-      .pipe(tap(info => console.log(info)));
 
     this.messageSendList$ = this.store.pipe(
       select(AppStore.MessengerSelector.MessageSelector.selectAllSendList)

projects/ucap-webmessenger-app/src/app/store/messenger/query/effects.ts

@@ -88,9 +88,17 @@ export class Effects {
                   userInfos.push(...(res as DeptUserData).userInfos);
                   break;
                 case SSVC_TYPE_QUERY_DEPT_USER_RES:
-                  userInfos.sort((a, b) => {
+                  userInfos.sort((a, b) =>
-                    return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
+                    a.order < b.order
-                  });
+                      ? -1
+                      : a.order > b.order
+                      ? 1
+                      : a.name < b.name
+                      ? -1
+                      : a.name > b.name
+                      ? 1
+                      : 0
+                  );
 
                   this.store.dispatch(
                     deptUserSuccess({

projects/ucap-webmessenger-app/src/app/store/messenger/query/reducers.ts

@@ -35,20 +35,9 @@ export const reducer = createReducer(
   }),
 
   on(deptUserSuccess, (state, action) => {
-    const userList = action.userInfos.sort((a, b) =>
-      a.order < b.order
-        ? -1
-        : a.order > b.order
-        ? 1
-        : a.name < b.name
-        ? -1
-        : a.name > b.name
-        ? 1
-        : 0
-    );
     return {
       ...state,
-      selectedDepartmentUserInfoList: userList,
+      selectedDepartmentUserInfoList: action.userInfos,
       selectedDepartmentStatus: action.res,
       selectedDepartmentProcessing: false
     };