From 88bd44f649aeeb56d158e7d9bd642ad7f3741ed8 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期日, 28 四月 2024 15:14:03 +0800
Subject: [PATCH] 代码提交
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
index 4c7e248..d486158 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
@@ -117,12 +117,11 @@
.eq(OrderMentalTest::getUserId, userId)
.eq(OrderMentalTest::getStatusFlag, OrderStatusFlagEnum.PAY_SUCCESS.getCode())
.in(OrderMentalTest::getGoodsId, topicIdList)
- .groupBy(OrderMentalTest::getGoodsId)
);
return new SuccessResponseData(list.stream().map(o -> {
// 是否后台创建
- o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getAnswerNo())).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
+ o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getAnswerNo()) && oo.getIsBack()).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
// 是否测试
o.setTestFlag(mentalTestResultAll.stream().filter(oo -> oo.getTopicId().equals(o.getTopicId())).findFirst().isPresent());
--
Gitblit v1.7.1