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 40d5b611..c961534f 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/CourseLabelController.java
@@ -10,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.CourseLabel;
 import com.ibeetl.jlw.service.CourseLabelService;
 import com.ibeetl.jlw.web.query.CourseLabelQuery;
+import org.apache.commons.collections4.SetUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.ibeetl.jlw.enums.AddTypeEnum.ADMIN_ADD;
 import static com.ibeetl.jlw.enums.AddTypeEnum.FACULTY_ADD;
@@ -123,11 +125,11 @@ public class CourseLabelController{
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else {
+            Assert.isTrue(coreUser.isUniAdmin() || coreUser.isAdmin(), "只允许学校管理员和超管访问改接口！");
             CourseLabel cl = courseLabelService.queryById(courseLabel.getCourseLabelId());
             // 只有超管才能修改系统分配的数据
-            Assert.isTrue(ADMIN_ADD.equals(cl.getAddType()) && coreUser.isAdmin(), "用户无法修改系统分配的数据！");
-            // 只有超管和学校管理员才能修改院校上传的数据
-            Assert.isTrue(FACULTY_ADD.equals(cl.getAddType()) && (coreUser.isAdmin() || coreUser.isUniAdmin()), "用户无法权限修改该数据！");
+            Assert.isFalse(ADMIN_ADD.equals(cl.getAddType()) && coreUser.isUniAdmin(), "用户无法修改系统分配的数据！");
+
             boolean success = courseLabelService.updateTemplate(courseLabel);
             if (success) {
                 return JsonResult.success();
@@ -153,6 +155,9 @@ public class CourseLabelController{
             param.setSeeSelf(true);
         }
         List<CourseLabel>list = courseLabelService.getValuesByQueryNotWithPermission(param);
+        list = list.stream()
+                .filter(courseLabel -> SetUtils.hashSet(coreUser.getOrgId(), 1).contains(courseLabel.getOrgId()) || courseLabel.getOrgId() == null)
+                .collect(Collectors.toList());
         return  JsonResult.success(list);
     }
 
diff --git a/web/src/main/resources/templates/jlw/courseLabel/index.html b/web/src/main/resources/templates/jlw/courseLabel/index.html
index c7387610..cb54a676 100644
--- a/web/src/main/resources/templates/jlw/courseLabel/index.html
+++ b/web/src/main/resources/templates/jlw/courseLabel/index.html
@@ -76,8 +76,10 @@
                 <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'){ }}
                         <i class="layui-icon classEdit">&#xe642;</i>
                         <i class="layui-icon classDel">&#xe640;</i>
+                        {{# } }}
                     </div>
                 </div>
                 {{# }); }}
@@ -101,8 +103,10 @@
                 <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'){ }}
                         <i class="layui-icon classEdit">&#xe642;</i>
                         <i class="layui-icon classDel">&#xe640;</i>
+                        {{# } }}
                     </div>
                 </div>
                 {{# }); }}
@@ -126,8 +130,10 @@
                 <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'){ }}
                         <i class="layui-icon classEdit">&#xe642;</i>
                         <i class="layui-icon classDel">&#xe640;</i>
+                        {{# } }}
                     </div>
                 </div>
                 {{# }); }}