课程分类

web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java

@@ -156,7 +156,7 @@ public class CourseLabelController{
         }
         List<CourseLabel>list = 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);
     }

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);

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);

web/src/main/resources/templates/jlw/courseLabel/index.html

@@ -76,7 +76,7 @@
                 <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
                     <label class="layui-form-label">{{item.courseLabelName}}</label>
                     <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 classDel">&#xe640;</i>
                         {{# } }}
@@ -103,7 +103,7 @@
                 <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
                     <label class="layui-form-label">{{item.courseLabelName}}</label>
                     <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 classDel">&#xe640;</i>
                         {{# } }}
@@ -130,7 +130,7 @@
                 <div class="layui-form-item" courseLabelId="{{item.courseLabelId}}">
                     <label class="layui-form-label">{{item.courseLabelName}}</label>
                     <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 classDel">&#xe640;</i>
                         {{# } }}