From 0af8d2525b8e58c3eb2c3eb30bb32ac482d20856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index f127c72..8aa7f58 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -233,7 +233,8 @@
private void addMemberModelByType(Integer id,Integer type, List<IdentityInfo> list,String path) {
MPJLambdaWrapper<IdentityInfo> wrapper = new MPJLambdaWrapper<IdentityInfo>()
- .selectAll(IdentityInfo.class).selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
+ .selectAll(IdentityInfo.class)
+ .selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
.leftJoin(SystemUser.class,SystemUser::getId,IdentityInfo::getUpdateUser)
.orderByDesc(IdentityInfo::getCreateTime )//鍙栨渶鏂颁竴鏉�
.eq(IdentityInfo::getMemberId,id)
@@ -242,23 +243,7 @@
.last("limit 1");
IdentityInfo model = identityInfoMapper.selectJoinOne(IdentityInfo.class,wrapper);
if(model !=null){
- model.setImgList(new ArrayList<>());
- if(StringUtils.isNotBlank(model.getImg1())){
- model.setImg1(path+model.getImg1());
- model.getImgList().add(model.getImg1());
- }
- if(StringUtils.isNotBlank(model.getImg2())){
- model.setImg2(path+model.getImg2());
- model.getImgList().add(model.getImg2());
- }
- if(StringUtils.isNotBlank(model.getImg3())) {
- model.setImg3(path + model.getImg3());
- model.getImgList().add(model.getImg3());
- }
- if(StringUtils.isNotBlank(model.getImg4())){
- model.setImg4(path+model.getImg4());
- model.getImgList().add(model.getImg4());
- }
+ initModelImage(model,path);
list.add(model);
}
}
@@ -269,7 +254,11 @@
MPJLambdaWrapper<IdentityInfo> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setDeleted(Constants.ZERO);
- queryWrapper.selectAll(IdentityInfo.class).selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
+ queryWrapper.selectAll(IdentityInfo.class)
+ .selectAs(Member::getNickName,IdentityInfo::getMemberName)
+ .selectAs(Member::getOpenid,IdentityInfo::getOpenid)
+ .selectAs(SystemUser::getUsername,IdentityInfo::getEditorName)
+ .leftJoin(Member.class,Member::getId,IdentityInfo::getMemberId)
.leftJoin(SystemUser.class,SystemUser::getId,IdentityInfo::getUpdateUser);
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(IdentityInfo::getId, pageWrap.getModel().getId());
@@ -338,7 +327,37 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(identityInfoMapper.selectJoinPage(page,IdentityInfo.class, queryWrapper));
+ PageData<IdentityInfo> result = PageData.from(identityInfoMapper.selectJoinPage(page,IdentityInfo.class, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INENTITY_FILES).getCode();
+ for (IdentityInfo model :result.getRecords()){
+ initModelImage(model,path);
+ }
+ }
+
+ return result;
+
+ }
+
+ private void initModelImage(IdentityInfo model, String path) {
+ model.setImgList(new ArrayList<>());
+ if(StringUtils.isNotBlank(model.getImg1())){
+ model.setImg1(path+model.getImg1());
+ model.getImgList().add(model.getImg1());
+ }
+ if(StringUtils.isNotBlank(model.getImg2())){
+ model.setImg2(path+model.getImg2());
+ model.getImgList().add(model.getImg2());
+ }
+ if(StringUtils.isNotBlank(model.getImg3())) {
+ model.setImg3(path + model.getImg3());
+ model.getImgList().add(model.getImg3());
+ }
+ if(StringUtils.isNotBlank(model.getImg4())){
+ model.setImg4(path+model.getImg4());
+ model.getImgList().add(model.getImg4());
+ }
}
@Override
--
Gitblit v1.9.3