From 207a624e25a01919a58e4120d81c2e14c3ef2783 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 11 Jul 2023 17:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/ScreenEventReportServiceImpl.java    | 2 ++
 .../epdc/service/impl/ScreenVolunteerActivityServiceImpl.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java
index f93fef3e..2b852acd 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventReportServiceImpl.java
@@ -71,6 +71,8 @@ public class ScreenEventReportServiceImpl extends BaseServiceImpl<ScreenEventRep
         QueryWrapper<ScreenEventReportEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
+        wrapper.orderByAsc("time");
+
         return wrapper;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java
index 10edb3f1..6fa019aa 100755
--- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java
@@ -75,7 +75,7 @@ public class ScreenVolunteerActivityServiceImpl extends BaseServiceImpl<ScreenVo
         String type = (String)params.get("type");
         wrapper.eq(StringUtils.isNotBlank(type), "type", type);
 
-        wrapper.orderByAsc("count");
+        wrapper.orderByAsc("time");
 
         return wrapper;
     }