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 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>getList(TeacherOpenCourseScheduleSessionClassQuery param,@SCoreUser CoreUser coreUser) { + public JsonResult>getList(TeacherOpenCourseScheduleSessionClassQuery condition,@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - Listlist = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(param); + if (!coreUser.isAdmin()) { + condition.setOrgId(condition.getOrgId()); + } + Listlist = 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> getLevelList(TeacherOpenCourseScheduleSessionClassQuery param,@SCoreUser CoreUser coreUser) { + public JsonResult> getLevelList(TeacherOpenCourseScheduleSessionClassQuery condition,@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - Listlist = teacherOpenCourseScheduleSessionClassService.getLevelList(param); + if (!coreUser.isAdmin()) { + condition.setOrgId(condition.getOrgId()); + } + Listlist = 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>getList(TeacherOpenCourseScheduleSessionQuery param,@SCoreUser CoreUser coreUser) { + public JsonResult>getList(TeacherOpenCourseScheduleSessionQuery condition,@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - Listlist = teacherOpenCourseScheduleSessionService.getValuesByQuery(param); + if (!coreUser.isAdmin()) { + condition.setOrgId(condition.getOrgId()); + } + Listlist = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition); return JsonResult.success(list); } } @@ -180,7 +186,10 @@ public class TeacherOpenCourseScheduleSessionController{ */ @PostMapping(API + "/listGroup.do") @ResponseBody - public JsonResult listGroup(TeacherOpenCourseScheduleSessionQuery condition){ + public JsonResult 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 list(TeacherOpenCourseScheduleSessionQuery condition){ + public JsonResult 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>getValues(TeacherOpenCourseScheduleSessionQuery param) { - Listlist = teacherOpenCourseScheduleSessionService.getValuesByQuery(param); + public JsonResult>getValues(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser) { + if (!coreUser.isAdmin()) { + condition.setOrgId(condition.getOrgId()); + } + Listlist = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition); return JsonResult.success(list); }