支持按创建时间降序、复杂排序

src/main/java/com/ylcm/sys/controller/AdMediaController.java

@@ -73,7 +73,7 @@ public class AdMediaController extends BaseController{
         result.put("code", Constants.CODE_SUCCESS);
         result.put("msg", "操作成功");
         
-        IPage<AdMedia> page = getAdMedia(name, rank, pageSize, pageNo);
+        IPage<AdMedia> page = getAdMedia(name, rank, pageSize, pageNo, false);
         IPage<AdMediaVO> vos = new Page<AdMediaVO>();
         BeanUtils.copyProperties(page, vos);
         List<AdMediaVO> voList = new ArrayList<>((int) page.getSize());
@@ -89,7 +89,7 @@ public class AdMediaController extends BaseController{
         returnResult(request, response, result);
     }
 	
-	private IPage<AdMedia> getAdMedia(String name, Integer rank, Integer pageSize, Integer pageNo) {
+	private IPage<AdMedia> getAdMedia(String name, Integer rank, Integer pageSize, Integer pageNo, Boolean complexSort) {
 		LambdaQueryWrapper<AdMedia> queryWrapper = new LambdaQueryWrapper<AdMedia>();
         if (rank != null) {
 			queryWrapper.eq(AdMedia::getRank, rank);
@@ -100,8 +100,10 @@ public class AdMediaController extends BaseController{
 		}
 		queryWrapper.orderByAsc(AdMedia::getName);
 		IPage<AdMedia> iPage = adMediaService.page(new Page<AdMedia>(pageNo, pageSize), queryWrapper);
-		// 复杂排序规则，所以单独获取 list
-		iPage.setRecords(adMediaService.getListByPage(name, rank, pageSize, pageNo));
+		// 复杂排序规则，单独获取 list
+		if (complexSort != null && complexSort){
+			iPage.setRecords(adMediaService.getListByPage(name, rank, pageSize, pageNo));
+		}
 		return iPage;
 	}
 	
@@ -109,7 +111,7 @@ public class AdMediaController extends BaseController{
     public void export(String name, Integer rank, 
     		HttpServletRequest request, HttpServletResponse response) {
 		ExcelUtil.exportExcelToWebsite(response,"媒体列表",new AdMediaExportDTO(),(currentPage, pageSize) -> {
-			return toExport(getAdMedia(name, rank, pageSize, currentPage).getRecords());
+			return toExport(getAdMedia(name, rank, pageSize, currentPage, false).getRecords());
 		});
     }
 	
@@ -286,7 +288,7 @@ public class AdMediaController extends BaseController{
     	JSONObject vo = new JSONObject();
     	int count = adMediaService.getTotalByName(name);
     	if(count > 0) {
-    		IPage<AdMedia> page = getAdMedia(name, null , pageSize, pageNo);
+    		IPage<AdMedia> page = getAdMedia(name, null , pageSize, pageNo, true);
     		for (AdMedia select : page.getRecords()) {
     			JSONObject obj = new JSONObject();
     			obj.put("id", select.getName());