diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 30e619fa..0c983fb9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -172,7 +172,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService i.getTeacherOpenCourseKnowledgePointId().toString()).collect(Collectors.joining(",")); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java index 5cce457e..fc4f1ab2 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.util.ObjectUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -137,13 +138,19 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ * 新增,解绑绑定知识点 * * @param pointRelationQuery true 添加绑定 false 修改绑定 - * @param type 添加实现 2 + * @param type 添加实操 2 * @return */ @Transactional public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery, boolean isBindingKnowledgePoint,int type) { String teacherOpenCourseKnowledgePointIdPlural = Objects.isNull(pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural()) ? "" : pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural(); + if (ObjectUtil.isEmpty(teacherOpenCourseKnowledgePointIdPlural)){ + JsonResult jsonResult = new JsonResult(); + jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); + jsonResult.setMsg("获取绑定ID失败"); + return jsonResult; + } String[] knowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural.split(","); if (isBindingKnowledgePoint) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java index 51457ed5..1e41cc76 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.util.ObjectUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.Interceptor.TStudent; import cn.jlw.Interceptor.TTeacher; @@ -187,7 +188,12 @@ public class TeacherOpenCourseController{ if (!coreUser.isAdmin()) { condition.setOrgId(coreUser.getOrgId()); } -// condition.setTeacherOpenCourseStatus(1); + if (coreUser.isUniAdmin() && ObjectUtil.isEmpty(condition.getTeacherOpenCourseStatus())){ + condition.setTeacherOpenCourseStatusPlural("1,2"); + } + if (!coreUser.isAdmin() && !coreUser.isUniAdmin()){ + condition.setTeacherOpenCourseStatus(1); + } teacherOpenCourseService.queryByCondition(page); return JsonResult.success(page); }