From 9d5309c820d525b46e65490475957b641707db51 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 15:57:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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