소스 검색

查询课程是否学完问题
创建试卷失败问题

xushili 2 년 전
부모
커밋
90b9a09dfa

+ 1 - 1
exam-06173-api/src/main/java/com/gyee/exam/modules/exam/service/impl/ExamServiceImpl.java

@@ -82,7 +82,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements Ex
 
         // 从token中获得用户ID
         String userId = UserUtils.getUserId(false);
-        if (!reqDTO.getCreateBy().equals(userId)){
+        if (reqDTO.getCreateBy() != null && !reqDTO.getCreateBy().equals(userId)) {
             throw new ServiceException("非创建人不允许修改");
         }
 

+ 4 - 3
exam-06173-api/src/main/resources/mapper/stat/course/StatCourseMapper.xml

@@ -88,12 +88,13 @@
         (SELECT IFNULL(SUM(learn_min),0) FROM el_course_file_learn fl WHERE fl.course_id=cl.course_id AND fl.user_id=cl.user_id) AS totalMin
         FROM el_course_depart dept
         LEFT JOIN sys_user uc ON dept.dept_code=uc.dept_code
-        LEFT JOIN el_course_learn cl ON cl.user_id=uc.id AND cl.course_id=dept.course_id
-        WHERE uc.id IS NOT NULL AND dept.course_id=#{query.courseId}
+        LEFT JOIN el_course_person cp ON cp.user_id=uc.id
+        LEFT JOIN el_course_learn cl ON cl.user_id=uc.id AND (cl.course_id=dept.course_id or cl.course_id=cp.course_id)
+        WHERE uc.id IS NOT NULL AND cl.course_id=#{query.courseId}
         <if test="query.userId!=null and query.userId!=''">
             AND uc.id = #{query.userId}
         </if>
-        ORDER BY cl.state DESC,totalMin DESC
+        ORDER BY cl.state DESC,totalMin DESC LIMIT 1
 
     </select>