From 02b5be2705a2a5b7c179130eaf5ebf3eb9350fff Mon Sep 17 00:00:00 2001
From: none <none>
Date: Thu, 30 Mar 2023 09:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=B3=BB=E7=BB=9F=E7=A8=B3?=
 =?UTF-8?q?=E5=AE=9A=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyz/playedu/api/controller/frontend/UserController.java   | 4 ++--
 .../api/service/impl/UserLearnDurationStatsServiceImpl.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
index 9b13b2d..9b50447 100644
--- a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
+++ b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
@@ -139,8 +139,8 @@ public class UserController {
         int nunRequiredHourCount = 0;//选修课时
         int requiredFinishedHourCount = 0;//已完成必修课时
         int nunRequiredFinishedHourCount = 0;//已完成选修课时
-        int todayLearnDuration = userLearnDurationStatsService.todayUserDuration(FCtx.getId());//今日学习时长
-        int learnDuration = userLearnDurationStatsService.userDuration(FCtx.getId());//学习总时长
+        Integer todayLearnDuration = userLearnDurationStatsService.todayUserDuration(FCtx.getId());//今日学习时长
+        Integer learnDuration = userLearnDurationStatsService.userDuration(FCtx.getId());//学习总时长
 
         // -------- 学习数据统计 ----------
         if (courses.size() > 0) {
diff --git a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java
index 050c524..f765d4f 100644
--- a/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java
+++ b/src/main/java/xyz/playedu/api/service/impl/UserLearnDurationStatsServiceImpl.java
@@ -80,7 +80,8 @@ public class UserLearnDurationStatsServiceImpl extends ServiceImpl<UserLearnDura
 
     @Override
     public Integer userDuration(Integer userId) {
-        return getBaseMapper().getUserDuration(userId);
+        Integer totalDuration = getBaseMapper().getUserDuration(userId);
+        return totalDuration == null ? 0 : totalDuration;
     }
 }