From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 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..abb07ef 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,8 +1,8 @@ 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.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.HiddenDangerLogMapper; @@ -12,7 +12,6 @@ import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.HiddenDanger; import com.doumee.dao.business.model.HiddenDangerLog; -import com.doumee.dao.business.model.Member; import com.doumee.dao.system.SystemUserMapper; import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.HiddenDangerLogService; @@ -126,15 +125,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 +142,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