--no commit message

com.zrqx.system/src/main/java/com/zrqx/system/fg/mapper/question/FgExaminationMapper.java

@@ -16,7 +16,6 @@ public interface FgExaminationMapper extends BaseMapper<Examination> {
 	@Select("<script>" 
 			+ "SELECT id,title,text,DATE_FORMAT(beginTime,'%Y年%m月%d日') beginTime,DATE_FORMAT(endTime,'%Y-%m-%d') endTime,"
 			+ "userName,userId FROM sys_examination where status=2 and type=2"
-			+ " ORDER BY createTime DESC "
 			+ "</script>")
 	List<FgExaminationVo> page();
 	@Select("<script>" 

com.zrqx.system/src/main/java/com/zrqx/system/fg/service/question/FgExaminationServiceImpl.java

@@ -105,6 +105,7 @@ public class FgExaminationServiceImpl extends BaseServiceImpl<Examination,String
 		if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
 			pageParam.setOrderBy("createTime desc");
 		}
+		startPage(pageParam);
 		List<FgExaminationVo> list = mapper.page();
 		for (FgExaminationVo fgExaminationVo : list) {
 			 //获取所属部门