From 0cd1086c79dc9039ef1555c902578e21e82f9ebe Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Thu, 26 Dec 2024 21:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/course/service/impl/CourseServiceImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
index e18da800..48edf0d3 100644
--- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
@@ -149,11 +149,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
             sort = ObjectUtil.defaultIfNull(sort, 0);
             List<Map<String, Object>> records = mapIPage.getRecords();
             if(sort != null && sort == 1){
-                records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("goodNum"))).collect(Collectors.toList());
+                records = records.stream().sorted(Comparator.comparingLong(item -> (long)ObjectUtil.defaultIfNull(item.get("goodNum"),0L))).collect(Collectors.toList());
                 Collections.reverse(records);
             }
             if(sort != null && sort == 2){
-                records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("weekGoodNum"))).collect(Collectors.toList());
+                records = records.stream().sorted(Comparator.comparingLong(item -> (long)ObjectUtil.defaultIfNull(item.get("weekGoodNum"),0L))).collect(Collectors.toList());
                 Collections.reverse(records);
             }
             for (Map<String, Object> map:records){
@@ -184,11 +184,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
                 sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse,wxShow,dyShow);
         List<Map<String, Object>> records = mapIPage.getRecords();
         if(sort != null && sort == 1){
-            records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("goodNum"))).collect(Collectors.toList());
+            records = records.stream().sorted(Comparator.comparingLong(item -> (long)ObjectUtil.defaultIfNull(item.get("goodNum"),0L))).collect(Collectors.toList());
             Collections.reverse(records);
         }
         if(sort != null && sort == 2){
-            records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("weekGoodNum"))).collect(Collectors.toList());
+            records = records.stream().sorted(Comparator.comparingLong(item -> (long)ObjectUtil.defaultIfNull(item.get("weekGoodNum"),0L))).collect(Collectors.toList());
             Collections.reverse(records);
         }
         for (Map<String, Object> map:records){