From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..ebdb331 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,15 +126,15 @@
if(Objects.isNull(hiddenDanger)){
return null;
}
- HiddenDangerLog newBean = new HiddenDangerLog();
- newBean.setCreateUserName("-");
- newBean.setCompanyName("-");
- newBean.setTitle("闅愭偅澶勭悊");
- newBean.setAvatar("-");
-
if(hiddenDanger.getStatus().equals(Constants.ZERO)){
//涓嬩竴姝ュ鐞嗕汉
- SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
+ 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()).last(" limit 1 "));
if(Objects.nonNull(systemUser)){
newBean.setCreateUserName(systemUser.getRealname());
newBean.setAvatar(systemUser.getAvatar());
@@ -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