fix 模考列表显示规则

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -358,9 +358,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         Collections.sort(userMockSubscribeVos, new Comparator<UserMockSubscribeVo>() {
             @Override
             public int compare(UserMockSubscribeVo o1, UserMockSubscribeVo o2) {
-                //TODO: 升序排列
+                //升序排列
                 //return o1.getApplySiteExamTime().compareTo(o2.getApplySiteExamTime());
-                //TODO: 降序排列
+                //降序排列
                 return o2.getApplySiteExamTime().compareTo(o1.getApplySiteExamTime());
             }
         });

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -176,7 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_mock_subscribe ums
         LEFT JOIN mock_apply ma ON ums.apply_id = ma.apply_id
         WHERE
-                ( ums.mock_major_subject_id, ums.apply_site_exam_time ) IN ( SELECT mock_major_subject_id, max( apply_site_exam_time ) FROM user_mock_subscribe GROUP BY mock_major_subject_id )
+                ( ums.mock_major_subject_id, ums.apply_site_exam_time ) IN
+                ( SELECT mock_major_subject_id, max( apply_site_exam_time )
+                FROM user_mock_subscribe
+                WHERE 1=1
+                <if test="userId != null and userId != ''">
+                    and user_id = #{userId}
+                </if>
+                GROUP BY mock_major_subject_id )
         <if test="startTime != null and startTime != ''">
             and ums.apply_site_exam_time &gt; #{startTime}
         </if>