From 29a737bba3a4606d5fc5dd0bd5f817fdf7f3de55 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 8 Feb 2023 02:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...acherOpenCourseScheduleSessionService.java | 6 +++++
...nCourseScheduleSessionClassController.java | 19 +++++++++----
...erOpenCourseScheduleSessionController.java | 27 ++++++++++++++-----
3 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
index 1ea8225d..3b6cb259 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.annotation.Master;
+import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.util.holidays.Day;
@@ -51,6 +52,7 @@ import static cn.hutool.core.date.DateUtil.offsetDay;
import static cn.hutool.core.date.DateUtil.parseDate;
import static com.ibeetl.admin.core.util.BeanUtil.copyToListSupportExtMap;
import static com.ibeetl.admin.core.util.DateUtil.weekNumberInList;
+import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toMap;
@@ -324,6 +326,10 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
if (null != teacherId) {
query.setTeacherId(teacherId);
}
+ CoreUser user = getUser();
+ if (user != null && !user.isAdmin()) {
+ query.setOrgId(query.getOrgId());
+ }
List<TeacherOpenCourseScheduleSession> list = teacherOpenCourseScheduleSessionService.getValuesByQuery(query);
dictParser(list);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
index 8cc00257..fe0c383f 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
@@ -50,6 +50,9 @@ public class TeacherOpenCourseScheduleSessionClassController{
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
PageQuery page = condition.getPageQuery();
teacherOpenCourseScheduleSessionClassService.queryByConditionQuery(page);
return JsonResult.success(page);
@@ -71,11 +74,14 @@ public class TeacherOpenCourseScheduleSessionClassController{
@GetMapping(API + "/getList.do")
@ResponseBody
- public JsonResult<List<TeacherOpenCourseScheduleSessionClass>>getList(TeacherOpenCourseScheduleSessionClassQuery param,@SCoreUser CoreUser coreUser) {
+ public JsonResult<List<TeacherOpenCourseScheduleSessionClass>>getList(TeacherOpenCourseScheduleSessionClassQuery condition,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
- List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(param);
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
+ List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(condition);
return JsonResult.success(list);
}
}
@@ -131,17 +137,20 @@ public class TeacherOpenCourseScheduleSessionClassController{
/**
* 学校管理员端-获取带有层级的列表
- * @param param
+ * @param condition
* @param coreUser
* @return
*/
@PostMapping(MODEL + "/levelList.json")
@ResponseBody
- public JsonResult<List<TeacherOpenCourseScheduleSessionClass>> getLevelList(TeacherOpenCourseScheduleSessionClassQuery param,@SCoreUser CoreUser coreUser) {
+ public JsonResult<List<TeacherOpenCourseScheduleSessionClass>> getLevelList(TeacherOpenCourseScheduleSessionClassQuery condition,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
- List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getLevelList(param);
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
+ List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getLevelList(condition);
return JsonResult.success(list);
}
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
index fb42ca34..72e6cc2c 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
@@ -66,6 +66,9 @@ public class TeacherOpenCourseScheduleSessionController{
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
PageQuery page = condition.getPageQuery();
teacherOpenCourseScheduleSessionService.queryByConditionQuery(page);
return JsonResult.success(page);
@@ -87,11 +90,14 @@ public class TeacherOpenCourseScheduleSessionController{
@GetMapping(API + "/getList.do")
@ResponseBody
- public JsonResult<List<TeacherOpenCourseScheduleSession>>getList(TeacherOpenCourseScheduleSessionQuery param,@SCoreUser CoreUser coreUser) {
+ public JsonResult<List<TeacherOpenCourseScheduleSession>>getList(TeacherOpenCourseScheduleSessionQuery condition,@SCoreUser CoreUser coreUser) {
if(null == coreUser){
return JsonResult.failMessage("请登录后再操作");
}else{
- List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(param);
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
+ List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition);
return JsonResult.success(list);
}
}
@@ -180,7 +186,10 @@ public class TeacherOpenCourseScheduleSessionController{
*/
@PostMapping(API + "/listGroup.do")
@ResponseBody
- public JsonResult<PageQuery> listGroup(TeacherOpenCourseScheduleSessionQuery condition){
+ public JsonResult<PageQuery> listGroup(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
PageQuery page = condition.getPageQuery();
teacherOpenCourseScheduleSessionService.queryByConditionGroup(page);
return JsonResult.success(page);
@@ -192,7 +201,10 @@ public class TeacherOpenCourseScheduleSessionController{
@Function("teacherOpenCourseScheduleSession.query")
@ResponseBody
@Deprecated
- public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionQuery condition){
+ public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
PageQuery page = condition.getPageQuery();
teacherOpenCourseScheduleSessionService.queryByCondition(page);
return JsonResult.success(page);
@@ -276,8 +288,11 @@ public class TeacherOpenCourseScheduleSessionController{
@GetMapping(MODEL + "/getValues.json")
@Function("teacherOpenCourseScheduleSession.query")
@ResponseBody
- public JsonResult<List<TeacherOpenCourseScheduleSession>>getValues(TeacherOpenCourseScheduleSessionQuery param) {
- List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(param);
+ public JsonResult<List<TeacherOpenCourseScheduleSession>>getValues(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser) {
+ if (!coreUser.isAdmin()) {
+ condition.setOrgId(condition.getOrgId());
+ }
+ List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition);
return JsonResult.success(list);
}