公域课程分类调整，展示问题处理

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseCategoryController.java

@@ -16,6 +16,7 @@ import com.fs.course.config.CourseConfig;
 
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
+import com.github.pagehelper.util.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -155,12 +156,16 @@ public class FsUserCourseCategoryController extends BaseController
 
     //获取1级总分类
     @GetMapping("/getCatePidList")
-    public R getCatePidList()
+    public R getCatePidList(String isOpenClass)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        if (StringUtil.isNotEmpty(isOpenClass)){
+            List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryIsOpenClassList(isOpenClass);
+            return R.ok().put("data", list);
+        }
         if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
             List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(userId);
             return R.ok().put("data", list);

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseController.java

@@ -86,9 +86,9 @@ public class FsUserCourseController extends BaseController {
         Long userId = loginUser.getUser().getUserId();
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+      /*  if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
             fsUserCourse.setUserId(userId);
-        }
+        }*/
         List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListPVO(fsUserCourse);
         return getDataTable(list);
     }

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseCategoryMapper.java

@@ -102,6 +102,15 @@ public interface FsUserCourseCategoryMapper
     @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 ")
     List<OptionsVO> selectAllFsUserCourseCategoryPidList();
 
+
+    /**
+     * 查询公域分类
+     *
+     * @return
+     */
+    @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 and is_open_class = #{isOpenClass} ")
+    List<OptionsVO> selectFsUserCourseCategoryIsOpenClassList( @Param("isOpenClass") String isOpenClass);
+
     /**
      * 根据名称和上级ID查询分类
      */

fs-service/src/main/java/com/fs/course/service/IFsUserCourseCategoryService.java

@@ -76,4 +76,12 @@ public interface IFsUserCourseCategoryService
      * 课堂分类导入
      */
     Map<String, Object> importData(List<FsCourseCategoryImportDTO> list, Long userId);
+
+    /**
+     * 查询公域私域课程
+     *
+     * @param isOpenClass
+     * @return
+     */
+    List<OptionsVO> selectFsUserCourseCategoryIsOpenClassList(String isOpenClass);
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseCategoryServiceImpl.java

@@ -206,4 +206,9 @@ public class FsUserCourseCategoryServiceImpl implements IFsUserCourseCategorySer
         resp.put("failList", failedList);
         return resp;
     }
+
+    @Override
+    public List<OptionsVO> selectFsUserCourseCategoryIsOpenClassList(String isOpenClass) {
+        return fsUserCourseCategoryMapper.selectFsUserCourseCategoryIsOpenClassList(isOpenClass);
+    }
 }