1、修复bug

beetlsql3-dev
wgf 2 years ago
parent ef20584670
commit 359c9379a0

@ -172,7 +172,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
.andEq(TeacherOpenCourseKnowledgePoint::getUserId, teacherOpenCourseHandsOnQuery.getUserId()) .andEq(TeacherOpenCourseKnowledgePoint::getUserId, teacherOpenCourseHandsOnQuery.getUserId())
.andEq(TeacherOpenCourseKnowledgePoint::getOrgId, teacherOpenCourseHandsOnQuery.getOrgId()) .andEq(TeacherOpenCourseKnowledgePoint::getOrgId, teacherOpenCourseHandsOnQuery.getOrgId())
.andEq(TeacherOpenCourseKnowledgePoint::getChapterId, teacherOpenCourseHandsOnQuery.getCourseChildNode()) .andEq(TeacherOpenCourseKnowledgePoint::getChapterId, teacherOpenCourseHandsOnQuery.getCourseChildNode())
.andEq(TeacherOpenCourseKnowledgePoint::getTeacherOpenCourseId, teacherOpenCourseHandsOnQuery.getTeacherOpenCourseId()) .andEq(TeacherOpenCourseKnowledgePoint::getTeacherOpenCourseId, teacherOpenCourseHandsOnQuery.getCourseInfoId())
.select() .select()
.stream() .stream()
.map(i -> i.getTeacherOpenCourseKnowledgePointId().toString()).collect(Collectors.joining(",")); .map(i -> i.getTeacherOpenCourseKnowledgePointId().toString()).collect(Collectors.joining(","));

@ -1,5 +1,6 @@
package com.ibeetl.jlw.service; package com.ibeetl.jlw.service;
import cn.hutool.core.util.ObjectUtil;
import cn.jlw.util.ToolUtils; import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -137,13 +138,19 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ
* *
* *
* @param pointRelationQuery true false * @param pointRelationQuery true false
* @param type 2 * @param type 2
* @return * @return
*/ */
@Transactional @Transactional
public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery, boolean isBindingKnowledgePoint,int type) { public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery, boolean isBindingKnowledgePoint,int type) {
String teacherOpenCourseKnowledgePointIdPlural = Objects.isNull(pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural()) ? "" : pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural(); 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(","); String[] knowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural.split(",");
if (isBindingKnowledgePoint) { if (isBindingKnowledgePoint) {

@ -1,5 +1,6 @@
package com.ibeetl.jlw.web; package com.ibeetl.jlw.web;
import cn.hutool.core.util.ObjectUtil;
import cn.jlw.Interceptor.SCoreUser; import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.Interceptor.TStudent; import cn.jlw.Interceptor.TStudent;
import cn.jlw.Interceptor.TTeacher; import cn.jlw.Interceptor.TTeacher;
@ -187,7 +188,12 @@ public class TeacherOpenCourseController{
if (!coreUser.isAdmin()) { if (!coreUser.isAdmin()) {
condition.setOrgId(coreUser.getOrgId()); 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); teacherOpenCourseService.queryByCondition(page);
return JsonResult.success(page); return JsonResult.success(page);
} }

Loading…
Cancel
Save