From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 18 十月 2024 14:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 312a77c..c118373 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
@@ -126,14 +126,14 @@
if(Objects.isNull(hiddenDanger)){
return null;
}
- HiddenDangerLog newBean = new HiddenDangerLog();
- newBean.setCreateUserName("-");
- newBean.setCompanyName("-");
- newBean.setTitle("闅愭偅澶勭悊");
- newBean.setAvatar("-");
-
if(hiddenDanger.getStatus().equals(Constants.ZERO)){
//涓嬩竴姝ュ鐞嗕汉
+ HiddenDangerLog newBean = new HiddenDangerLog();
+ newBean.setCreateUserName("-");
+ newBean.setCompanyName("-");
+ newBean.setTitle("闅愭偅澶勭悊");
+ newBean.setAvatar("-");
+
SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
if(Objects.nonNull(systemUser)){
newBean.setCreateUserName(systemUser.getRealname());
@@ -143,15 +143,17 @@
newBean.setCompanyName(company.getCompanyNamePath());
}
}
+ hiddenDangerLogList.add(newBean);
}
- hiddenDangerLogList.add(newBean);
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())){
+ if(StringUtils.isNotBlank(bean.getAvatar() ) && bean.getAvatar().indexOf("HKIMG")<0 ){
bean.setAvatar(path + bean.getAvatar());
+ }else{
+ bean.setAvatar(null);
}
}
}
--
Gitblit v1.9.3