From bda269b21d3b876f16c7489e69eb362447e921c6 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 26 Jun 2023 10:40:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ibeetl/jlw/web/CourseLabelController.java    | 3 +++
 .../com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java  | 1 +
 web/src/main/resources/sql/jlw/courseLabel.md                  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
index b0709ac6..3450796b 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
@@ -85,6 +85,9 @@ public class CourseLabelController{
         if (coreUser.isUniAdmin()) {
             param.setSeeSelf(true);
         }
+        if (!coreUser.isAdmin()){
+            param.setOrgIdPlural("1,"+coreUser.getOrgId());
+        }
         List<CourseLabel>list = courseLabelService.getValuesByQueryNotWithPermission(param);
         return  JsonResult.success(list);
     }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java
index 89d01645..0cf6d566 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseNoticeController.java
@@ -131,6 +131,7 @@ public class TeacherOpenCourseNoticeController{
         if (coreUser.isStudent()) {
             Student student = getStudent();
             condition.setSchoolClassIds(student.getClassId().toString());
+            condition.setOrgId(coreUser.getOrgId());
         }
         teacherOpenCourseNoticeService.queryByConditionQuery(page, coreUser);
         return JsonResult.success(page);
diff --git a/web/src/main/resources/sql/jlw/courseLabel.md b/web/src/main/resources/sql/jlw/courseLabel.md
index 523a76b7..83e398e4 100644
--- a/web/src/main/resources/sql/jlw/courseLabel.md
+++ b/web/src/main/resources/sql/jlw/courseLabel.md
@@ -103,6 +103,6 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(seeSelf) && seeSelf && !isEmpty(userId)){
   and (t.add_type = 'ADMIN_ADD' or t.user_id = #userId#)
   @}
-  @if(!isEmpty(seeSelf)){
+  @if(!isEmpty(orgIdPlural)){
   and FIND_IN_SET(t.org_id,#orgIdPlural#)
   @}