From bf13676673e9f0f090a68bd8cfbaefbf0d696d32 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期日, 26 十一月 2023 13:03:00 +0800
Subject: [PATCH] 讨论区关键字过滤、首页班级显示班级信息
---
src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java b/src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java
index f71fc0c..ffec783 100644
--- a/src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java
+++ b/src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java
@@ -100,9 +100,14 @@
@Override
public List<ExerciseInfo> list(String keyword,String classId,Short status,Integer pageSize,Integer pageNum) {
StringBuffer hql = new StringBuffer(500);
- hql.append("from ExerciseInfo e where e.name like ? and e.createId =? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
-
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append("from ExerciseInfo e where e.name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and e.createId =?");
+ params.add(teacherId);
+ }
if(status!=null){
hql.append(" and e.status = ? ");
params.add(status);
@@ -120,9 +125,14 @@
@Override
public int listCount(String keyword,String classId, Short status) {
StringBuffer hql = new StringBuffer(500);
- hql.append("from ExerciseInfo e where e.name like ? and e.createId =? ");
- List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%',ClientUtils.getUserId());
-
+ //鍒ゆ柇鏄惁鏄暀甯�
+ String teacherId = ClientUtils.isAdmin() ? null : ClientUtils.getUserId();
+ hql.append("from ExerciseInfo e where e.name like ? ");
+ List<Object> params = CollectionUtils.newList('%' + keyword.trim() + '%');
+ if (StringUtils.isNotBlank(teacherId)) {
+ hql.append(" and e.createId =?");
+ params.add(teacherId);
+ }
if(status!=null){
hql.append(" and e.status = ? ");
params.add(status);
--
Gitblit v1.8.0