diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/enums/MenuEnums.java b/admin-core/src/main/java/com/ibeetl/admin/core/enums/MenuEnums.java index 33f80e34..e67641b7 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/enums/MenuEnums.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/enums/MenuEnums.java @@ -14,12 +14,13 @@ public enum MenuEnums { // 管理岗位子类型 JT_S_01("系统管理员", T_ADMIN, 1), - JT_S_02("教师管理员", null, null), JT_S_04("院校管理员", T_COLLEGES_ADMIN, 2), + JT_S_02("教师管理员", T_TEACHER, 3), // 操作岗位子类型 JT_S_03("学生", T_STUDENT, 4), - JT_S_05("教师", T_TEACHER, 3); +// JT_S_05("教师", T_TEACHER, 3) + ; private final String name; private final String attributeName; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 612fdf6a..364ac8ac 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -252,7 +252,7 @@ public class Teacher extends BaseEntity implements AbstractToken { @Override public MenuEnums getIdentity() { - return MenuEnums.JT_S_05; + return MenuEnums.JT_S_02; } public Long getUniversitySystemId() { diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md index 4cca6332..2533dabe 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md @@ -1,3 +1,15 @@ +fromTypeFragment +=== +* sql片段,用于显示来源类型,系统超管或者院校导入。该片段一定要在select的最后添加,没有结尾符号 + ,IF + (( + SELECT EXISTS + ( SELECT 1 FROM core_user za WHERE za.id = t.user_id AND za.job_type1 = 'JT_S_01' )) + OR t.user_id IS NULL, + '系统超管', + '院校上传' + ) AS from_type + queryByCondition === * 根据不为空的参数进行分页查询 @@ -5,6 +17,7 @@ queryByCondition select @pageTag(){ t.* + #use("fromTypeFragment")# @} from teacher_open_course_merge_resources_info t where 1=1 @@ -64,6 +77,7 @@ queryByConditionQuery select @pageTag(){ t.* + #use("fromTypeFragment")# @} from teacher_open_course_merge_resources_info t where 1=1 @@ -239,6 +253,7 @@ getValuesByQuery * 根据不为空的参数进行查询 select t.* + #use("fromTypeFragment")# from teacher_open_course_merge_resources_info t where 1=1 and #function("teacherOpenCourseMergeResourcesInfo.query")# @if(!isEmpty(teacherOpenCourseMergeResourcesInfoId)){