From 79ab2cbd31c022916a8e696903d5eb34b70aa403 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期六, 25 十一月 2023 15:57:07 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/controller/IndexController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/IndexController.java b/src/main/java/com/qxueyou/scc/controller/IndexController.java
index 73694c4..9158f6e 100644
--- a/src/main/java/com/qxueyou/scc/controller/IndexController.java
+++ b/src/main/java/com/qxueyou/scc/controller/IndexController.java
@@ -9,6 +9,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import com.qxueyou.scc.admin.teacher.service.ITeacherService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +37,8 @@
@Autowired
IClassService classService;
-
+ @Autowired
+ private ITeacherService teacherService;
@Value("${server.context-index}")
private String WEB_INDEX;
@@ -49,14 +52,21 @@
// request.getSession().invalidate();
// ClientUtils.isAdmin()=true;
- String teacherId = ClientUtils.isAdmin()?null:ClientUtils.getUserId();
-
- List<ClsClass> clsLst = classService.getClassLst("",teacherId, 2000, 1, 1);
-
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : teacherService.getTeacherIdByUserId(ClientUtils.getUserId());
+
+ List<ClsClass> clsLst = new ArrayList<>();
+ if (StringUtils.isNotBlank(teacherId)) {
+ //鑾峰彇璇ヨ�佸笀涓嬪彂甯冪殑璇剧▼鐨勬墍灞炵彮绾�
+ clsLst = classService.getTeacherClassLst(teacherId);
+ }else{
+ //绠＄悊鍛樻煡璇㈡墍鏈夌彮绾�
+ clsLst =classService.getClassLst("",teacherId, 2000, 1, 1);
+ }
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>(clsLst.size()*2);
-
for(ClsClass cls:clsLst) {
- result.add(classService.getClassActivityInfo(cls.getClassId()));
+ Map<String, Object> classActivityInfo = classService.getClassActivityInfo(cls.getClassId());
+ result.add(classActivityInfo);
}
return new Result(true,null,result);
--
Gitblit v1.8.0