Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java

@@ -27,11 +27,11 @@ public class HandsOn extends BaseEntity{
     private Long handsOnId ;
 	
     //归属课程
-
+    @Dict(type = "course_info.course_info_name.course_info_status=1")
     private Long courseInfoId ;
 	
     //归属章节
-
+    @Dict(type = "course_info.course_info_name.course_info_status=1")
     private String courseChildNode ;
 	
     //实操名称

web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java

@@ -2,13 +2,11 @@ package com.ibeetl.jlw.web;
 
 import cn.jlw.Interceptor.RFile;
 import cn.jlw.Interceptor.SCoreUser;
-import cn.jlw.aliPay.utils.StringUtils;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.CourseInfo;
-import com.ibeetl.jlw.entity.CourseLabel;
 import com.ibeetl.jlw.entity.FileEntity;
 import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
 import com.ibeetl.jlw.service.CourseInfoService;
@@ -172,14 +170,14 @@ public class CourseInfoController{
     @Function("courseInfo.add")
     @ResponseBody
     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()){
             CourseInfo ci = courseInfoService.queryById(courseInfoQuery.getCourseInfoParentId());
             courseInfoQuery.setCourseLabelId(ci.getCourseLabelId());