From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/exam/action/ExamController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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