Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/resources/mapper/course/CourseDao.xml

src/main/resources/mapper/course/CourseCollectDao.xml

@@ -6,6 +6,34 @@
 
     <select id="selectCourseByCollect" resultType="com.sqx.modules.course.entity.Course">
         SELECT
+            MAX(u.update_time) AS produceEndTime,
+            c.*,
+            d1.course_details_name AS courseDetailsName,
+            d1.course_details_id AS courseDetailsId,
+            COUNT(d2.course_details_id) AS courseDetailsCount
+        FROM
+            course_collect u
+                LEFT JOIN
+            course c ON u.course_id = c.course_id
+                LEFT JOIN
+            course_collect cc1 ON cc1.course_id = u.course_id
+                AND cc1.classify = 3
+                AND cc1.user_id = #{userId}
+                LEFT JOIN
+            course_details d1 ON cc1.course_details_id = d1.course_details_id
+                LEFT JOIN
+            course_details d2 ON d2.course_id = c.course_id
+        WHERE
+            u.user_id = #{userId}
+          AND c.course_id IS NOT NULL
+          AND u.classify = #{classify}
+        GROUP BY
+            u.course_id, c.course_id
+        ORDER BY
+            produceEndTime DESC;
+
+
+ <!--       SELECT
             MAX( u.update_time ) AS produceEndTime,
             c.*,
             (
@@ -46,6 +74,7 @@
             u.course_id
         ORDER BY
             produceEndTime DESC
+            -->
     </select>
 
-</mapper>
+</mapper>