From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +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/LocksServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index e933d41..59f4148 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -177,7 +177,7 @@
systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
String code = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
String prePath = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.IMG_DIR).getCode();
- bikesList.forEach(bikes-> {
+ for(Bikes bikes : bikesList){
if (Constants.equalsInteger(force,Constants.ONE) || StringUtils.isBlank(bikes.getImgurl())){
try {
wxMiniUtilService.generateEbikeWXMiniCode(bikes, WxMiniConfig.wxMaService.getAccessToken(),prePath,code);
@@ -188,11 +188,12 @@
bikes.setEditDate(new Date());
bikesMapper.updateById(bikes);
}
- if (StringUtils.isNotBlank(bikes.getImgurl())){
- bikes.setImgurl(fullPath+bikes.getImgurl());
- }
}
- });
+ if (StringUtils.isNotBlank(bikes.getImgurl())){
+ bikes.setImgurl(fullPath+bikes.getImgurl());
+ }
+ }
+
}
return bikesList;
@@ -321,7 +322,7 @@
}
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IMG_DIR).getCode()+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
for(Bikes l : bikesList){
- if(StringUtils.isNotBlank(l.getInfo())){
+ if(StringUtils.isNotBlank(l.getImgurl())){
File file = new File(path + l.getImgurl());
if(file!=null && file.isFile()){
fileList.add(file);
--
Gitblit v1.9.3