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 c961534f..719090f0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java @@ -156,7 +156,7 @@ public class CourseLabelController{ } Listlist = courseLabelService.getValuesByQueryNotWithPermission(param); 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()); return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java index c646ecf3..ad9b611f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java @@ -143,7 +143,7 @@ public class ResourcesInfoController{ PageQuery page = condition.getPageQuery(); 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); return JsonResult.success(page); diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index 999d3d42..9b341393 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -154,7 +154,7 @@ public class ResourcesQuestionController{ } 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); return JsonResult.success(page); diff --git a/web/src/main/resources/templates/jlw/courseLabel/index.html b/web/src/main/resources/templates/jlw/courseLabel/index.html index cb54a676..4a1a71f6 100644 --- a/web/src/main/resources/templates/jlw/courseLabel/index.html +++ b/web/src/main/resources/templates/jlw/courseLabel/index.html @@ -76,7 +76,7 @@
- {{# if(item.addType != 'ADMIN_ADD'){ }} + {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false}) || (item.addType == 'FACULTY_ADD' && ${user.get().isUniAdmin!false})){ }} {{# } }} @@ -103,7 +103,7 @@
- {{# if(item.addType != 'ADMIN_ADD'){ }} + {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false})){ }} {{# } }} @@ -130,7 +130,7 @@
- {{# if(item.addType != 'ADMIN_ADD'){ }} + {{# if((item.addType == 'ADMIN_ADD' && ${user.get().isAdmin!false})){ }} {{# } }}