From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index cec7e7b..3282cca 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -249,11 +249,18 @@
.selectAs(Sites::getName,Bikes::getSiteName) ;
PageData<Bikes> pageData = PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
double finalLow = low;
- pageData.getRecords().forEach(i->{
- if(Constants.equalsInteger(i.getType(),Constants.ONE)){
- i.setLowVoltage(i.getVoltage().compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
- }
- });
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageData.getRecords())){
+ pageData.getRecords().forEach(i->{
+ if(Constants.equalsInteger(i.getType(),Constants.ONE)){
+ if(Objects.isNull(i.getVoltage())){
+ i.setLowVoltage(Constants.ONE);
+ }else{
+ i.setLowVoltage(i.getVoltage().compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
+ }
+ }
+ });
+ }
+
return pageData;
}
--
Gitblit v1.9.3