From 8a5b2412572a697c1f468d013b3a2f9c54a6cf68 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Mon, 27 Feb 2023 19:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialDetectionReportServiceImpl.java        | 2 +-
 .../windowdisplay/controller/WindowDisplayController.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
index d2f4388ac..a35d4ef54 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
@@ -52,7 +52,7 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl<MaterialDete
                 // 更新时间 yyyy-MM-dd HH:mm:ss 之前
                 .le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate())
                 .eq(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getMaterialType()), MaterialDetectionReport::getMaterialType, materialDetectionReportQo.getMaterialType());
-        wrapper.orderByDesc(MaterialDetectionReport::getUpdateDate);
+        wrapper.orderByDesc(MaterialDetectionReport::getDetectionDate);
         return materialDetectionReportMapper.selectPage(page, wrapper);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/windowdisplay/controller/WindowDisplayController.java b/src/main/java/com/zhgd/xmgl/modules/windowdisplay/controller/WindowDisplayController.java
index ef6b7d61d..012105f9e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/windowdisplay/controller/WindowDisplayController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/windowdisplay/controller/WindowDisplayController.java
@@ -62,7 +62,7 @@ public class WindowDisplayController {
                 .eq(windowDisplayQo.getUpdateDate() != null, WindowDisplay::getUpdateDate, windowDisplayQo.getUpdateDate())
                 .like(CharSequenceUtil.isNotBlank(windowDisplayQo.getImageUrl()), WindowDisplay::getImageUrl, windowDisplayQo.getImageUrl())
                 .like(CharSequenceUtil.isNotBlank(windowDisplayQo.getLinkUrl()), WindowDisplay::getLinkUrl, windowDisplayQo.getLinkUrl());
-
+        wrapper.orderByDesc(WindowDisplay::getId);
         return Result.success(windowDisplayService.page(page, wrapper));
     }