From 0e62c15e4b010ffa2d5cff9474f3fd389e369338 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 24 十一月 2023 14:31:46 +0800
Subject: [PATCH] 优化作业、考试、试卷、题库
---
src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java b/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
index d75b99e..05193af 100644
--- a/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classroom/service/impl/ClassRoomService.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.qxueyou.scc.admin.classroom.model.ClassRoom;
@@ -93,13 +94,19 @@
@Override
public List<ClassRoom> list(String keyword, Short status, Integer pageSize, Integer pageNum) {
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ClassRoom where name like ? and createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
+ hql.append(" from ClassRoom where name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
+ }
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
}
hql.append(" and deleteFlag is false order by createTime desc");
@@ -109,14 +116,20 @@
@Override
public int listCount(String keyword, Short status) {
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
StringBuffer hql = new StringBuffer(500);
- hql.append(" from ClassRoom where name like ? and createId=? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
+ hql.append(" from ClassRoom where name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
if(status!=null){
hql.append(" and status = ? ");
params.add(status);
}
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and createId=?");
+ params.add(teacherId);
+ }
hql.append(" and deleteFlag is false ");
--
Gitblit v1.8.0