问题处理

exam-06173-api/src/main/java/com/gyee/exam/modules/course/mapper/CourseMapper.java

@@ -40,7 +40,7 @@ public interface CourseMapper extends BaseMapper<Course> {
      */
     IPage<UserCourseRespDTO> userPaging(Page page, @Param("query") UserCourseReqDTO reqDTO);
 
-    List<UserCourseProcessDTO> userPagingToal(Page page, @Param("query") UserCourseReqDTO reqDTO);
+    List<UserCourseProcessDTO> userPagingToal(@Param("query") UserCourseReqDTO reqDTO);
 
     List<CourseDepartRankDTO> courseDepartRank(@Param("query") BaseQueryReqDTO reqDTO);
 

exam-06173-api/src/main/java/com/gyee/exam/modules/course/service/impl/CourseServiceImpl.java

@@ -227,7 +227,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     public IPage<UserCourseRespDTO> userPaging(PagingReqDTO<UserCourseReqDTO> reqDTO) {
         IPage<UserCourseRespDTO> page = baseMapper.userPaging(reqDTO.toPage(), reqDTO.getParams());
-        Map<String, UserCourseProcessDTO> map = baseMapper.userPagingToal(reqDTO.toPage(), reqDTO.getParams()).stream().collect(Collectors.toMap(UserCourseProcessDTO::getId, userCourseProcessDTO -> userCourseProcessDTO));
+
+        Map<String, UserCourseProcessDTO> map = baseMapper.userPagingToal(reqDTO.getParams()).stream().collect(Collectors.toMap(UserCourseProcessDTO::getId, userCourseProcessDTO -> userCourseProcessDTO));
         page.getRecords().stream().forEach(i->{
             i.setNeedLearnCount(map.get(i.getId()).getNeedLearn());
             i.setLearnMinCount(map.get(i.getId()).getLearnMin());

exam-06173-api/src/main/java/com/gyee/exam/modules/paper/dto/ext/PaperQuAnswerExtDTO.java

@@ -26,6 +26,9 @@ public class PaperQuAnswerExtDTO extends PaperQuAnswerDTO {
     private String image;
 
     public void setContent(String content) {
-        this.content = content.trim();
+        if(null !=content && content.length()>0){
+            this.content = content.trim();
+        }
+
     }
 }