From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/EvaluateController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/EvaluateController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/EvaluateController.java
index 097a2f3..6c038bc 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/EvaluateController.java
@@ -54,7 +54,7 @@
Page<OrderEvaluateVO> list = evaluateClient.evaluateListByUser(loginUser.getUserid(), state, pageNum, pageSize).getData();
if (null != list) {
// 数据封装，减少循环io
- List<Integer> ids = list.getRecords().stream().map(OrderEvaluateVO::getServeId).collect(Collectors.toList());
+ List<Integer> ids = list.getRecords().stream().map(data -> data.getOrderInfo().getServeId()).collect(Collectors.toList());
if (!ids.isEmpty()) {
List<RecoveryServe> serveList = recoveryServeService.lambdaQuery()
.in(RecoveryServe::getId, ids)
@@ -62,7 +62,7 @@
Map<Integer, RecoveryServe> map = serveList.stream().collect(Collectors.
toMap(RecoveryServe::getId, data -> data));
for (OrderEvaluateVO data : list.getRecords()) {
- Integer serveId = data.getServeId();
+ Integer serveId = data.getOrderInfo().getServeId();
RecoveryServe recoveryServe = map.get(serveId);
if (null != recoveryServe) {
EvaluateOrderInfoVO orderInfo = data.getOrderInfo();
--
Gitblit v1.7.1