tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

课程分类

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 5b7bacab17
commit 64524bfd8c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
Unescape Escape View File

@ -156,7 +156,7 @@ public class CourseLabelController{
} }
List<CourseLabel>list = courseLabelService.getValuesByQueryNotWithPermission(param); List<CourseLabel>list = courseLabelService.getValuesByQueryNotWithPermission(param);
list = list.stream() list = list.stream()
.filter(courseLabel -> SetUtils.hashSet(coreUser.getOrgId(), 1).contains(courseLabel.getOrgId()) || courseLabel.getOrgId() == null) .filter(courseLabel -> SetUtils.hashSet(coreUser.getOrgId(), 1L).contains(courseLabel.getOrgId()) || courseLabel.getOrgId() == null)
.collect(Collectors.toList()); .collect(Collectors.toList());
return JsonResult.success(list); return JsonResult.success(list);
} }

2
web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java
Unescape Escape View File

@ -143,7 +143,7 @@ public class ResourcesInfoController{
PageQuery page = condition.getPageQuery(); PageQuery page = condition.getPageQuery();
if (coreUser.isUniAdmin()) { if (coreUser.isUniAdmin()) {
condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1, null).toArray(), ",")); condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ","));
} }
resourcesInfoService.queryByCondition(page); resourcesInfoService.queryByCondition(page);
return JsonResult.success(page); return JsonResult.success(page);

2
web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
Unescape Escape View File

@ -154,7 +154,7 @@ public class ResourcesQuestionController{
} }
if (coreUser.isUniAdmin()) { if (coreUser.isUniAdmin()) {
condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1, null).toArray(), ",")); condition.setOrgIdPlural(join(Arrays.asList(coreUser.getOrgId(), 1L, null).toArray(), ","));
} }
resourcesQuestionService.queryByCondition(page); resourcesQuestionService.queryByCondition(page);
return JsonResult.success(page); return JsonResult.success(page);

6
web/src/main/resources/templates/jlw/courseLabel/index.html
Unescape Escape View File

@ -76,7 +76,7 @@
<div class="layui-form-item" courseLabelId="{{item.courseLabelId}}"> <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
<label class="layui-form-label">{{item.courseLabelName}}</label> <label class="layui-form-label">{{item.courseLabelName}}</label>
<div class="layui-input-block" style="line-height: 36px;"> <div class="layui-input-block" style="line-height: 36px;">
{{# if(item.addType != 'ADMIN_ADD'){ }} {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false}) || (item.addType == 'FACULTY_ADD' && ${user.get().isUniAdmin!false})){ }}
<i class="layui-icon classEdit">&#xe642;</i> <i class="layui-icon classEdit">&#xe642;</i>
<i class="layui-icon classDel">&#xe640;</i> <i class="layui-icon classDel">&#xe640;</i>
{{# } }} {{# } }}
@ -103,7 +103,7 @@
<div class="layui-form-item" courseLabelId="{{item.courseLabelId}}"> <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
<label class="layui-form-label">{{item.courseLabelName}}</label> <label class="layui-form-label">{{item.courseLabelName}}</label>
<div class="layui-input-block" style="line-height: 36px;"> <div class="layui-input-block" style="line-height: 36px;">
{{# if(item.addType != 'ADMIN_ADD'){ }} {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false})){ }}
<i class="layui-icon classEdit">&#xe642;</i> <i class="layui-icon classEdit">&#xe642;</i>
<i class="layui-icon classDel">&#xe640;</i> <i class="layui-icon classDel">&#xe640;</i>
{{# } }} {{# } }}
@ -130,7 +130,7 @@
<div class="layui-form-item" courseLabelId="{{item.courseLabelId}}"> <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
<label class="layui-form-label">{{item.courseLabelName}}</label> <label class="layui-form-label">{{item.courseLabelName}}</label>
<div class="layui-input-block" style="line-height: 36px;"> <div class="layui-input-block" style="line-height: 36px;">
{{# if(item.addType != 'ADMIN_ADD'){ }} {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false})){ }}
<i class="layui-icon classEdit">&#xe642;</i> <i class="layui-icon classEdit">&#xe642;</i>
<i class="layui-icon classDel">&#xe640;</i> <i class="layui-icon classDel">&#xe640;</i>
{{# } }} {{# } }}

Write Preview
Loading…
Cancel
Save