fix:博西PEA_V1.0-消息预警：已读消息刷新页面后，排序没向后置放，未读消息没有默认置前

project-order/src/main/java/com/dituhui/pea/order/controller/MsgController.java

@@ -40,17 +40,6 @@ public class MsgController {
                                                  MsgQuery request) {
         CommonUtil.setNullValue(request);
         request.setUserId(userId);
-        if ("isRead".equalsIgnoreCase(request.getSort())) {
-            request.setSort("is_read");
-        }
-        if ("type".equalsIgnoreCase(request.getSort())) {
-            request.setSort("type");
-        } else {
-            request.setSort("create_time");
-        }
-        if (!"asc".equalsIgnoreCase(request.getSortType())) {
-            request.setSortType("desc");
-        }
 
         if (Objects.nonNull(request.getEndDate())) {
             request.setEndDate(CommonUtil.addDays(request.getEndDate(), 1));

project-order/src/main/java/com/dituhui/pea/order/service/impl/MsgServiceImpl.java

@@ -22,10 +22,7 @@ import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -49,7 +46,24 @@ public class MsgServiceImpl implements MsgService {
 
     @Override
     public PageResult<MsgGroupResp> list(MsgQuery request) {
-        Sort sort = Sort.by("asc".equalsIgnoreCase(request.getSortType()) ? Sort.Direction.ASC : Sort.Direction.DESC, request.getSort());
+        List<Sort.Order> orders = new ArrayList<>();
+        Sort.Direction direction = Sort.Direction.ASC;
+        if (!"asc".equalsIgnoreCase(request.getSortType())) {
+            direction = Sort.Direction.DESC;
+        }
+        if ("isRead".equalsIgnoreCase(request.getSort())) {
+            request.setSort("is_read");
+        } else if ("type".equalsIgnoreCase(request.getSort())) {
+            request.setSort("type");
+        } else if ("createTime".equalsIgnoreCase(request.getSort())) {
+            request.setSort("create_time");
+        } else {
+            request.setSort("create_time");
+            orders.add(new Sort.Order(Sort.Direction.ASC,
+                    "is_read"));
+        }
+        orders.add(new Sort.Order(direction, request.getSort()));
+        Sort sort = Sort.by(orders);
         Pageable pageable = PageRequest.of(request.getPage() - 1, request.getSize(), sort);
         Page<Map<String, Objects>> page = msgDao.getGroupList(request, pageable);
         List<MsgGroupResp> list = page.getContent().stream().map(msg -> {