diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java index 5a7cc25..f853de0 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java @@ -151,7 +151,7 @@ public class FileServiceImpl extends ServiceImpl implements IF // 保存文件信息到数据库 saveFileInfo(fileName, bussinessid); AjaxResult ajaxResult=AjaxResult.success(); - ajaxResult.put("filePath", StringUtil.PATH_DEV+fileName); + ajaxResult.put("filePath", StringUtil.getFilePath()+fileName); ajaxResult.put("bussinessid",bussinessid); return ajaxResult; } catch (IOException e) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index e7e3204..985965d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -223,12 +223,20 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe job.setJobContactList(contacts); } //查询附件 - File file=new File(); - file.setBussinessid(jobId); - List filesList=fileMapper.selectFileList(file); - if(filesList!=null){ - job.setFilesList(filesList); - } + String baseFilePath = StringUtil.getFilePath(); + //查询附件 + File queryFile = new File(); + queryFile.setBussinessid(jobId); + List filesList = Optional.ofNullable(fileMapper.selectFileList(queryFile)) + .orElseGet(Collections::emptyList); + //添加路径 + List processedFiles = filesList.stream() + .filter(Objects::nonNull) + .filter(file -> file.getFileUrl() != null && !file.getFileUrl().trim().isEmpty()) + .peek(file -> file.setFileUrl(String.join("", baseFilePath, file.getFileUrl()))) + .collect(Collectors.toList()); + + job.setFilesList(processedFiles); return job; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java index 2aff2fa..de0984a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java @@ -48,7 +48,10 @@ public class StringUtil { *录用-招聘会 */ public static final String HIRE_SOURCE_ZPH="1"; - + /** + * 标记 + */ + public static final boolean PATH_TEST_ENV = true; /** * 测试环境附件地址 */ @@ -124,4 +127,12 @@ public class StringUtil { } return idCard.substring(0, 4) + "***" + idCard.substring(14); } + + /** + * 获取附件地址 + * @return + */ + public static String getFilePath(){ + return !PATH_TEST_ENV?PATH_PRO:PATH_DEV; + } }