From c2319eea40c7fa04e500ee269fa7479b2b87b28a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:40:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index f8cf708..7190d0f 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -1120,8 +1120,8 @@
         int orderNum = orderService.selectCount(wrapper);
         map.put("orderNum",orderNum);
         // 有效时长
-        int okTime =  this.baseMapper.getTime(sTime,eTime,uid);
-        map.put("okTime",okTime);
+        Integer okTime =  this.baseMapper.getTime(sTime,eTime,uid);
+        map.put("okTime",okTime==null?0:okTime);
         wrapperOne.eq("inviterType",2);
         wrapperOne.eq("inviterId",uid);
         int userNum = appUserService.selectCount(wrapperOne);

--
Gitblit v1.7.1