Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -127,6 +127,12 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     public Boolean insertByAddBo(MockApplyAddBo bo) {
         MockApply add = BeanUtil.toBean(bo, MockApply.class);
         validEntityBeforeSave(add);
+        LambdaQueryWrapper<MockApply> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MockApply::getApplyName, bo.getApplyName());
+        List<MockApply> mockApplyList = list(lqw);
+        if (mockApplyList != null && mockApplyList.size() > 0) {
+            throw new CustomException("模考标题不能重复");
+        }
         add.setCode(ServletUtils.getEncoded("KSAP"));
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());

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

@@ -166,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endTime != null and endTime != ''">
             AND ums.apply_site_exam_time &lt; #{endTime}
         </if>
+        order by ums.create_time desc
     </select>
     <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultMap="UserMockSubscribeVoResult">
         SELECT