1、qw发课小节问题处理

2、登陆传入companyUserToken

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -22,6 +22,7 @@ import com.fs.common.utils.PinYinUtil;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.bean.BeanUtils;
 import com.fs.common.utils.http.HttpUtils;
+import com.fs.common.utils.sign.Md5Utils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyUserCard;
@@ -213,6 +214,7 @@ public class UserController extends AppBaseController {
             Map<String, Object> result = new HashMap<>();
             result.put("token", token);
             result.put("user", companyUser);
+            result.put("companyUserToken", Md5Utils.hash(companyUser.getUserId().toString()));
             result.put("perms", perms);
             return R.ok("登录成功").put("data", result);
         } catch (Exception e) {

fs-company/src/main/java/com/fs/company/controller/qw/QwSopController.java

@@ -29,6 +29,7 @@ import com.fs.sop.service.IQwSopService;
 import com.fs.sop.service.IQwSopTempContentService;
 import com.fs.sop.service.IQwSopTempVoiceService;
 import com.fs.sop.vo.SopVoiceListVo;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -180,6 +181,7 @@ public class QwSopController extends BaseController
     @GetMapping(value = "/videoList/{id}")
     public R videoList(@PathVariable("id") Long id)
     {
+        PageHelper.clearPage();
         List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllList(id);
         return R.ok().put("list", optionsVOS);
     }

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

@@ -148,16 +148,19 @@ public interface FsUserCourseVideoMapper extends BaseMapper<FsUserCourseVideo> {
     Long selectFsUserCourseVideoByCourseSort(@Param("courseId") Long courseId, @Param("courseSort") Long courseSort);
 
 
-    @Select("select video_id dict_value, title dict_label  from fs_user_course_video where course_id=#{id} and is_del = 0 order by course_sort")
-    List<OptionsVO> selectFsUserCourseVodeAllList(Long id);
+    /**
+     * 按课程查询小节下拉（MyBatis 不支持同名方法重载，勿再增加同名重载）
+     */
+    @Select("select video_id dict_value, title dict_label, is_pause, open_class from fs_user_course_video where course_id=#{id} and is_del = 0 order by course_sort")
+    List<OptionsVO> selectFsUserCourseVodeAllList(@Param("id") Long id);
 
     @Select("<script>" +
-            "select video_id dict_value, title dict_label ,is_Pause,open_class from fs_user_course_video " +
+            "select video_id dict_value, title dict_label, is_pause, open_class from fs_user_course_video " +
             "where course_id=#{id} and is_del = 0 " +
             "<if test='title != null'> and title like concat('%', #{title}, '%') </if>"+
             " order by course_sort  "+
             "</script>")
-    List<OptionsVO> selectFsUserCourseVodeAllList(@Param("id")Long id, @Param("title")String title);
+    List<OptionsVO> selectFsUserCourseVodeAllListByTitle(@Param("id") Long id, @Param("title") String title);
 
     @Select({"<script> " +
             "select v.*,p.red_packet_money company_red_packet_money from fs_user_course_video v " +

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -548,7 +548,7 @@ public class CourseController extends  AppBaseController{
         if(userId==null){
             return R.error(403,"用户失效");
         }
-        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllList(id,title);
+        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllListByTitle(id, title);
         return R.ok().put("list", optionsVOS);
     }