From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 b8b7008..b4b873a 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
@@ -115,20 +115,25 @@
@Override
public List<Locks> findLockBase64List(Locks locks) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ String fullPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
wrapper.lambda().orderByAsc(Locks::getCode);
List<Locks> locksList = locksMapper.selectList(wrapper);
SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN);
+ String code = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prePath = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.IMG_DIR).getCode();
if (!CollectionUtils.isEmpty(locksList)){
// 妫�鏌ユ槸鍚︽湁鍥剧墖淇℃伅娌℃湁鏇存柊淇濆瓨鍥剧墖
locksList.forEach(s-> {
if (StringUtils.isBlank(s.getInfo())){
- wxMiniUtilService.generateWXMiniCode(s, systemDictData);
+ wxMiniUtilService.generateWXMiniCode(s,systemDictData,prePath,code);
s.setEditor(loginUserInfo.getId());
s.setEditDate(new Date());
updateById(s);
}
+ s.setImgfullurl(fullPath+s.getInfo());
});
return locksList;
}
--
Gitblit v1.9.3