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 f75174cf..57189d55 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java @@ -132,33 +132,36 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ * @return */ @Transactional - public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery) { + public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery,boolean isBindingKnowledgePoint) { String teacherOpenCourseKnowledgePointIdPlural = Objects.isNull(pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural()) ? "" : pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural(); String[] knowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural.split(","); + if (!isBindingKnowledgePoint){ + //先解绑 + List<TeacherOpenCourseKnowledgePointRelation> pointRelationList = sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class) + .andEq(TeacherOpenCourseKnowledgePointRelation::getBussinessId, pointRelationQuery.getBussinessId()) + .andEq(TeacherOpenCourseKnowledgePointRelation::getDelFlag, 0) + .andEq(TeacherOpenCourseKnowledgePointRelation::getOrgId, pointRelationQuery.getOrgId()) + .andEq(TeacherOpenCourseKnowledgePointRelation::getUserId, pointRelationQuery.getUserId()) + .select(); - //先解绑 - List<TeacherOpenCourseKnowledgePointRelation> pointRelationList = sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class) - .andEq(TeacherOpenCourseKnowledgePointRelation::getBussinessId, pointRelationQuery.getBussinessId()) - .andEq(TeacherOpenCourseKnowledgePointRelation::getDelFlag, 0) - .andEq(TeacherOpenCourseKnowledgePointRelation::getOrgId, pointRelationQuery.getOrgId()) - .andEq(TeacherOpenCourseKnowledgePointRelation::getUserId, pointRelationQuery.getUserId()) - .select(); - pointRelationList.stream().filter(item -> { - boolean b = true; - for (String s : knowledgePointIdPlural) { - if (Objects.equals(s, item.getTeacherOpenCourseKnowledgePointId().toString())) { - b = false; - break; + pointRelationList.stream().filter(item -> { + boolean b = true; + for (String s : knowledgePointIdPlural) { + if (Objects.equals(s, item.getTeacherOpenCourseKnowledgePointId().toString())) { + b = false; + break; + } } - } - return b; - }).collect(Collectors.toList()).forEach(item -> { - sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class) - .andEq(TeacherOpenCourseKnowledgePointRelation::getTeacherOpenCourseKnowledgeRelationId, item.getTeacherOpenCourseKnowledgeRelationId()) - .delete(); - }); + return b; + }).collect(Collectors.toList()).forEach(item -> { + sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class) + .andEq(TeacherOpenCourseKnowledgePointRelation::getTeacherOpenCourseKnowledgeRelationId, item.getTeacherOpenCourseKnowledgeRelationId()) + .delete(); + }); + } + //绑定、修改 diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java index 9e7a5c88..12c9fa9d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java @@ -181,7 +181,7 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<Teac relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(teacherOpenCourseKnowledgePointQuery.getTeacherOpenCourseKnowledgePointId().toString()); relationQuery.setBussinessType(1L); relationQuery.setBussinessId(teacherOpenCourseKnowledgePointQuery.getBussinessId()); - relationService.addBindingKnowledge(relationQuery); + relationService.addBindingKnowledge(relationQuery,true); } JsonResult jsonResult = new JsonResult(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java index c0f7cf6a..05608e2f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java @@ -219,7 +219,7 @@ public class TeacherOpenCourseKnowledgePointRelationController{ teacherOpenCourseKnowledgePointRelationQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseKnowledgePointRelationQuery.setCreateTime(new Date()); teacherOpenCourseKnowledgePointRelationQuery.setDelFlag(0); - return teacherOpenCourseKnowledgePointRelationService.addBindingKnowledge(teacherOpenCourseKnowledgePointRelationQuery); + return teacherOpenCourseKnowledgePointRelationService.addBindingKnowledge(teacherOpenCourseKnowledgePointRelationQuery,false); } }