From 5f8121997d21858ac2cd69af01f6ee4d41290bdc Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期三, 29 三月 2023 13:30:13 +0800
Subject: [PATCH] 121
---
src/main/java/com/qxueyou/scc/exam/action/ExamController.java | 4 +++-
src/main/java/com/qxueyou/scc/controller/SchoolRollController.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java b/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
index 1b5533e..33da0aa 100644
--- a/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
+++ b/src/main/java/com/qxueyou/scc/controller/SchoolRollController.java
@@ -36,7 +36,7 @@
* @param pageNum
* @return
*/
- @ApiOperation(value = "鑾峰彇姝ｅ绫嶅垪琛�", notes = "")
+ @ApiOperation(value = "鑾峰彇瀛︾睄鍒楄〃", notes = "")
@GetMapping(value = "/schoolList")
public Result schoolList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum,String keyword,String status) {
diff --git a/src/main/java/com/qxueyou/scc/exam/action/ExamController.java b/src/main/java/com/qxueyou/scc/exam/action/ExamController.java
index 43a1405..2fbf19d 100644
--- a/src/main/java/com/qxueyou/scc/exam/action/ExamController.java
+++ b/src/main/java/com/qxueyou/scc/exam/action/ExamController.java
@@ -372,7 +372,9 @@
public @ResponseBody Result queryStudentExamList(String keyword, String classId, String subjectId, Integer status, Integer pageSize, Integer pageNum) {
pageSize = pageSize != null && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE;
pageNum = pageNum != null && pageNum > 0 ? pageNum : DEFAULT_PAGE_NUM;
- classId=ClientUtils.getClassId();
+ if(classId==null){
+ classId=ClientUtils.getClassId();
+ }
System.out.println("avcd"+ClientUtils.getUserId());
// System.out.println(ClientUtils.getUserId()+"--cla"+classId+"--sub"+subjectId+"--sta"+status+"--key"+keyword+"--pag"+pageNum+"---siz"+pageSize);
String [] classIds= null;
--
Gitblit v1.8.0