Fna接口38

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.utils.SecurityUtil;
+import com.yd.common.constant.CommonConstant;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
@@ -155,8 +156,14 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         // 保单号
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
 
-        // 排序规则
-        queryWrapper.orderByDesc("id");
+        String sortField = fnaQueryRequest.getSortField();
+        String sortOrder = fnaQueryRequest.getSortOrder();
+        queryWrapper.orderBy(StringUtils.isNotBlank(sortField) && StringUtils.isNotBlank(sortOrder), sortOrder.equals(CommonConstant.SORT_ORDER_DESC),
+                "create_time");
+        // 默认排序规则
+        if (StringUtils.isBlank(sortField) && StringUtils.isBlank(sortOrder)) {
+            queryWrapper.orderByDesc("id");
+        }
         return queryWrapper;
     }