From eb9256cd2cba7a5cdf9ccbdc7919eb4652557105 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:43:12 +0800
Subject: [PATCH] 8.29
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 21 ++++++++++++++-------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 3 ++-
2 files changed, 16 insertions(+), 8 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 8eecf77..5ed1919 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
@@ -1722,12 +1722,15 @@
// List<String> subjectId = getSubjectId(week);
-
- String[] split = game.getSubjectIds().split(",");
List<String> subjectId = new ArrayList<>();
- for (String s : split) {
- subjectId.add(s);
+ String subjectIds = game.getSubjectIds();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
}
+
List<String> newSubjectId = subjectId.stream().map(data -> {
if (data.startsWith(Constants.REDUCE)) {
@@ -1784,11 +1787,15 @@
throw new GlobalException("当前季度该周目暂无配置游戏数据！");
}
// List<String> subjectId = getSubjectId(week);
- String[] split = game.getSubjectIds().split(",");
List<String> subjectId = new ArrayList<>();
- for (String s : split) {
- subjectId.add(s);
+ String subjectIds = game.getSubjectIds();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
}
+
List<String> subjectData = getSubjectData(game, subjectId);
List<TSubject> subjectList = getSubjectList(subjectData);
// 返回数据
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 51fac83..f1f2b60 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -1174,7 +1174,8 @@
}
TUser byId = userService.getById(loginUserStudy.getUserid());
byId.setLookVideo(1);
- return R.ok(byId);
+ userService.updateById(byId);
+ return R.ok();
}
@PostMapping("/deleteUser")
--
Gitblit v1.7.1