From 10f3a98226685340439a0b52afc62013c65da535 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 17:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index e200ffb..dada96b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -17,10 +18,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import java.util.List;
import java.util.Objects;
@@ -38,6 +39,9 @@
@Autowired
private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(HiddenDangerLog hiddenDangerLog) {
@@ -97,7 +101,7 @@
.selectAll(HiddenDangerLog.class)
.selectAs(SystemUser::getRealname,HiddenDangerLog::getCreateUserName)
.selectAs(SystemUser::getAvatar,HiddenDangerLog::getAvatar)
- .selectAs(Company::getName,HiddenDangerLog::getCompanyName)
+ .selectAs(Company::getCompanyNamePath,HiddenDangerLog::getCompanyName)
.leftJoin(SystemUser.class,SystemUser::getId,HiddenDangerLog::getCreator)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(Objects.nonNull(hiddenDangerLog.getHiddenDangerId()),HiddenDangerLog::getHiddenDangerId,hiddenDangerLog.getHiddenDangerId())
@@ -105,6 +109,14 @@
.eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
.orderByAsc(HiddenDangerLog::getCreateDate)
);
+
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ for (HiddenDangerLog bean:hiddenDangerLogList) {
+ if(StringUtils.isNotBlank(bean.getAvatar())){
+ bean.setAvatar(path + bean.getAvatar());
+ }
+ }
return hiddenDangerLogList;
}
--
Gitblit v1.9.3