diff --git a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java index b54ee4a3..f69f0b51 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java @@ -213,12 +213,14 @@ public class QuestionLogSummaryController extends BaseController { */ @GetMapping(MODEL + "/indexInfo.do") @Function("questionLogSummary.query") - public ModelAndView indexInfo(Long teacherOpenCourseId,Long questionSettingId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) { + public ModelAndView indexInfo(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId,Long questionSettingId, + @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) { ModelAndView view = new ModelAndView("/jlw/questionLogSummary/indexInfo.html") ; view.addObject("search", QuestionLogSummaryQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("questionSettingType", questionSettingType); view.addObject("questionSettingId", questionSettingId); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index 952d69d0..8f5185ec 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -135,11 +135,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoV.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoV(Long teacherOpenCourseId,Long handsOnId) { + public ModelAndView indexInfoV(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId,Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoV.html") ; view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -150,11 +151,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoP.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoP(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoP(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoP.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -165,11 +167,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoT.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoT(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoT(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoT.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -181,11 +184,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoS.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoS(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoS(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoS.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } @@ -196,11 +200,12 @@ public class TeacherOpenCourseHandsOnController{ */ @GetMapping(MODEL + "/indexInfoR.do") @Function("teacherOpenCourseHandsOn.query") - public ModelAndView indexInfoR(Long teacherOpenCourseId, Long handsOnId) { + public ModelAndView indexInfoR(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoR.html"); view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName()); view.addObject("teacherOpenCourseId", teacherOpenCourseId); view.addObject("handsOnId", handsOnId); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index 0eab945f..0563c512 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -192,11 +192,12 @@ public class TeacherOpenCourseStudentSigninLogController{ @GetMapping(MODEL + "/index.do") @Function("teacherOpenCourseStudentSigninLog.query") - public ModelAndView index(Long signinSettingId,Long tOCId) { + public ModelAndView index(Long signinSettingId,Long tOCId,@SCoreUser CoreUser coreUser) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseStudentSigninLog/index.html") ; view.addObject("search", TeacherOpenCourseStudentSigninLogQuery.class.getName()); view.addObject("teacherOpenCourseStudentSigninSettingId", signinSettingId); view.addObject("teacherOpenCourseId", tOCId); + view.addObject("orgId", coreUser.getOrgId()); return view; } diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html index ec5010df..5d0bbfa6 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html index 866f88ec..26a1f446 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html index ea480388..9cafbc2d 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html index 1f94b672..9d115540 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html index 25f840a2..2f06fa42 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html index 5ee78ac9..7684f5c8 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html @@ -6,7 +6,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html index b18149b3..049752bd 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html @@ -6,7 +6,7 @@
-