From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
index ed75d56..bc3882e 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/RecoveryServeController.java
@@ -73,7 +73,7 @@
List<RecoveryClassify> serveList = recoveryClassifyService.lambdaQuery()
.eq(RecoveryClassify::getIsDelete, 0)
.eq(RecoveryClassify::getSupClassify, serveType)
- .orderByDesc(RecoveryClassify::getSort)
+ .orderByAsc(RecoveryClassify::getSort)
.orderByDesc(RecoveryClassify::getCreateTime).list();
List<UserServeTypeVO> list = new ArrayList<>();
for (RecoveryClassify classify : serveList) {
@@ -161,7 +161,9 @@
UserRecipient userRecipient = userRecipientService.lambdaQuery()
.eq(UserRecipient::getIsDefault, Constants.ONE)
.eq(UserRecipient::getUserId, loginUser.getUserid())
- .eq(UserRecipient::getIsDelete, Constants.ZERO).one();
+ .eq(UserRecipient::getIsDelete, Constants.ZERO)
+ .last("limit 1")
+ .one();
return R.ok(new ServeDetailVO(recoveryServe, userRecipient));
}
--
Gitblit v1.7.1