From 68408ba6f0ff9c4e7978735818ab12990c957c1a Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期四, 03 十一月 2022 10:47:32 +0800
Subject: [PATCH] 忽略不需要提交的文件
---
src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
index 379c8a1..df8746e 100644
--- a/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
+++ b/src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import com.qxueyou.scc.base.model.UserInfoWrapper;
import com.qxueyou.scc.user.model.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
@@ -428,17 +429,15 @@
@ApiImplicitParam(name = "startTime", value = "开班时间", required = false, paramType="query", dataType = "String")
})
@GetMapping(value = "getSubjectLst")
- public Result getList(String classId, String startTime, Integer limit, @RequestParam(defaultValue="1")Integer pageNum, HttpServletRequest request) {
-// System.out.println("用户id"+request.getSession().getAttribute("userId"));
- Object userId = request.getSession().getAttribute("userId");
+ public Result getList(String userId,String classId, String startTime, Integer limit, @RequestParam(defaultValue="1")Integer pageNum, HttpServletRequest request) {
+ userId = StringUtils.isEmpty(userId)?ClientUtils.getUserId():userId;
classId = StringUtils.isEmpty(classId)?ClientUtils.getClassId():classId;
- List<MySubjectV> result = subjectService.listMySubjectV(classId,String.valueOf(userId));
+ List<MySubjectV> result = subjectService.listMySubjectV(classId,userId);
return new Result(true, "success",
QBeanUtils.listBean2ListMap(result,
CollectionUtils.newStringMap("id.subjectId", "subjectId", "id.classId", "classId",
"subjectName", "subjectName,coursewareName", "percent", "percent", "progressValue",
"studyTime", "coverPageUrl", "coverPageUrl")));
-
}
/**
--
Gitblit v1.8.0