From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 95f2de0..3397748 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
@@ -4,6 +4,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.StringTools;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.join.BikesJoinMapper;
@@ -19,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.system.SystemDictDataService;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -96,8 +98,9 @@
if(StringUtils.isBlank(m.getDeviceSn() )){
return;
}
- Bikes bikes = bikesJoinMapper.selectOne(new MPJLambdaWrapper<Bikes>()
- .eq(Bikes::getDeviceSn,String.format("%012s",m.getDeviceSn()))
+ String tSn = StringTools.leftPad(m.getDeviceSn(),12,'0') ;
+ Bikes bikes = bikesJoinMapper.selectOne(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getDeviceSn,tSn)
.eq(Bikes::getIsdeleted,Constants.ZERO)
.eq(Bikes::getType,Constants.ONE)
.last("limit 1"));
--
Gitblit v1.9.3