From 26780c533f2c2af6b9216306f649c1bcede94e4a Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 16:43:37 +0800
Subject: [PATCH] 学生、课程
---
src/main/java/com/qxueyou/scc/admin/examroom/service/impl/ExamRoomService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/examroom/service/impl/ExamRoomService.java b/src/main/java/com/qxueyou/scc/admin/examroom/service/impl/ExamRoomService.java
index 399750d..e7b6ffd 100644
--- a/src/main/java/com/qxueyou/scc/admin/examroom/service/impl/ExamRoomService.java
+++ b/src/main/java/com/qxueyou/scc/admin/examroom/service/impl/ExamRoomService.java
@@ -9,6 +9,7 @@
import com.qxueyou.scc.base.util.CollectionUtils;
import com.qxueyou.scc.base.util.TraceUtils;
import com.qxueyou.scc.exam.model.ExamInfo;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -93,14 +94,19 @@
@Override
public List<ExamRoom> list(String roomID, String keyword, Short status, Integer pageSize, Integer pageNum) {
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ExamRoom where createId=? and roomId =? ");
- List<Object> params = CollectionUtils.newList(ClientUtils.getUserId(),roomID);
-
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append(" from ExamRoom where roomId =? ");
+ List<Object> params = CollectionUtils.newList(roomID);
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
+ }
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
}
-
+
hql.append(" and deleteFlag is false order by createTime desc");
return findList(hql.toString(),new Pager(pageSize, pageNum),params, ExamRoom.class);
@@ -109,13 +115,19 @@
@Override
public int listCount(String roomID, String keyword, Short status) {
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ExamRoom where createId=? and roomId =? ");
- List<Object> params = CollectionUtils.newList(ClientUtils.getUserId(),roomID);
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append(" from ExamRoom where roomId =? ");
+ List<Object> params = CollectionUtils.newList(roomID);
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
}
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
+ }
/**
*
*/
--
Gitblit v1.8.0