|
|
@ -2,13 +2,11 @@ package com.ibeetl.jlw.web;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.jlw.Interceptor.RFile;
|
|
|
|
import cn.jlw.Interceptor.RFile;
|
|
|
|
import cn.jlw.Interceptor.SCoreUser;
|
|
|
|
import cn.jlw.Interceptor.SCoreUser;
|
|
|
|
import cn.jlw.aliPay.utils.StringUtils;
|
|
|
|
|
|
|
|
import com.ibeetl.admin.core.annotation.Function;
|
|
|
|
import com.ibeetl.admin.core.annotation.Function;
|
|
|
|
import com.ibeetl.admin.core.entity.CoreUser;
|
|
|
|
import com.ibeetl.admin.core.entity.CoreUser;
|
|
|
|
import com.ibeetl.admin.core.file.FileService;
|
|
|
|
import com.ibeetl.admin.core.file.FileService;
|
|
|
|
import com.ibeetl.admin.core.web.JsonResult;
|
|
|
|
import com.ibeetl.admin.core.web.JsonResult;
|
|
|
|
import com.ibeetl.jlw.entity.CourseInfo;
|
|
|
|
import com.ibeetl.jlw.entity.CourseInfo;
|
|
|
|
import com.ibeetl.jlw.entity.CourseLabel;
|
|
|
|
|
|
|
|
import com.ibeetl.jlw.entity.FileEntity;
|
|
|
|
import com.ibeetl.jlw.entity.FileEntity;
|
|
|
|
import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
|
|
|
|
import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
|
|
|
|
import com.ibeetl.jlw.service.CourseInfoService;
|
|
|
|
import com.ibeetl.jlw.service.CourseInfoService;
|
|
|
@ -172,14 +170,14 @@ public class CourseInfoController{
|
|
|
|
@Function("courseInfo.add")
|
|
|
|
@Function("courseInfo.add")
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public JsonResult add(CourseInfoQuery courseInfoQuery,@SCoreUser CoreUser coreUser){
|
|
|
|
public JsonResult add(CourseInfoQuery courseInfoQuery,@SCoreUser CoreUser coreUser){
|
|
|
|
if(null != courseInfoQuery.getCourseLabelId()){
|
|
|
|
// if(null != courseInfoQuery.getCourseLabelId()){
|
|
|
|
CourseLabel courseLabel = courseLabelService.queryById(courseInfoQuery.getCourseLabelId());
|
|
|
|
// CourseLabel courseLabel = courseLabelService.queryById(courseInfoQuery.getCourseLabelId());
|
|
|
|
|
|
|
|
//
|
|
|
|
if(null != courseLabel && courseLabel.getCourseLabelType().contains("应用课程类") &&
|
|
|
|
// if(null != courseLabel && courseLabel.getCourseLabelType().contains("应用课程类") &&
|
|
|
|
null == courseInfoQuery.getCourseInfoParentId() && StringUtils.isBlank(courseInfoQuery.getResourcesApplicationIds())){
|
|
|
|
// null == courseInfoQuery.getCourseInfoParentId() && StringUtils.isBlank(courseInfoQuery.getResourcesApplicationIds())){
|
|
|
|
return JsonResult.failMessage("请选择课程归属的应用");
|
|
|
|
// return JsonResult.failMessage("请选择课程归属的应用");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if(null != courseInfoQuery.getCourseInfoParentId()){
|
|
|
|
if(null != courseInfoQuery.getCourseInfoParentId()){
|
|
|
|
CourseInfo ci = courseInfoService.queryById(courseInfoQuery.getCourseInfoParentId());
|
|
|
|
CourseInfo ci = courseInfoService.queryById(courseInfoQuery.getCourseInfoParentId());
|
|
|
|
courseInfoQuery.setCourseLabelId(ci.getCourseLabelId());
|
|
|
|
courseInfoQuery.setCourseLabelId(ci.getCourseLabelId());
|
|
|
|