diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java index 8db6a24a..de8e3439 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java @@ -44,6 +44,9 @@ public class HandsOnQuery extends PageParam { private String orgIdPlural; + // 案例来源 + private String orgIdText; + private String CourseInfoFullIdStr; private String handsOnFrom; @@ -210,4 +213,12 @@ public class HandsOnQuery extends PageParam { public void setHandsOnFrom(String handsOnFrom) { this.handsOnFrom = handsOnFrom; } + + public String getOrgIdText() { + return orgIdText; + } + + public void setOrgIdText(String orgIdText) { + this.orgIdText = orgIdText; + } } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index 6ee7f39e..0001d292 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -153,6 +153,13 @@ queryByConditionMergeOpenCourseHandsOn @if(!isEmpty(handsOnFrom)){ and t.data_type = #handsOnFrom# @} + @if(!isEmpty(orgIdText) && orgIdText != null){ + @if(orgIdText = '超级管理员' || orgIdText = '管理员') { + and za.id = 1 + @} else { + and za.`name` like #'%'+orgIdText+'%'# + @} + @} @if(!isEmpty(courseInfoFullIdStr)){ and t.course_info_full_id regexp #courseInfoFullIdStr# @// 未授权任何应用的话,这里直接返回空数据