From 68aa7c66071339064dfd300a8e3d7540db09075d Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 17:39:33 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index b96e876..77cc262 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -828,7 +828,7 @@
.collect(Collectors.toList());
result = new SubjectRecordResultVO(teamIds, topicIds, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber());
} else {
- result = new SubjectRecordResultVO();
+ result = null;
}
subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0)
.eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update();
@@ -1096,14 +1096,8 @@
record.setType(Constants.ZERO);
update = update && studyRecordService.save(record);
}
- // 学习配置列表
- List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
- .orderByAsc(TStudy::getWeek).list();
- if (studyList.isEmpty()) {
- throw new GlobalException("学习配置列表未配置或数据失效！");
- }
// 更改学习记录
- Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(studyList, userId, completeStudy);
+ Boolean updateStudyRecord = userStudyService.exchangeStudyRecord(userId, completeStudy);
return R.ok(update && updateStudyRecord);
}
@@ -1616,6 +1610,7 @@
integralRecord.setUpdateTime(new Date());
return R.ok(integralRecordService.save(integralRecord));
}
+
@GetMapping("/addIntegralDetailParent")
// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
@ApiImplicitParams({
@@ -1680,10 +1675,11 @@
}
return R.ok(userService.updateById(user));
}
+
@GetMapping("/exchangeIntegralParent")
// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
public R<Boolean> exchangeIntegralParent(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
- if (tokenService.getLoginUser1()==null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
TUser user = userService.getById(tokenService.getLoginUser1().getUserid());
--
Gitblit v1.7.1