Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 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);
                }
            }
        }