diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index caf03ea8..319e3c23 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -159,7 +159,7 @@ public class ShiroConfig { // 获取token filterChainDefinitionMap.put("/srms/getByToken", "anon"); // 标准法规文档查询 - filterChainDefinitionMap.put("/srms/getByLawsFileList", "anon"); +// filterChainDefinitionMap.put("/srms/getByLawsFileList", "anon"); // 设计导航-产品设计条款查询 filterChainDefinitionMap.put("/srms/getByLawsProductDesign", "anon"); // 获取所有体系数据 diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java index 4dbfd879..06da483b 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java @@ -267,7 +267,15 @@ public class SrmsApiServiceImpl implements SrmsApiService { List listFile = listOssFile.stream().filter(o -> Objects.equals(o.getStandardId(), byFileRows.getId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listFile)) { listFile = listFile.stream().sorted(Comparator.comparing(OSSFile::getCreateTime).reversed()).collect(Collectors.toList()); - byFileRows.setStandardUrl(getUrl(listFile.get(0), token)); + // 查找有没有pdf版本 + LambdaQueryWrapper queryOssFilePdf = new LambdaQueryWrapper<>(); + queryOssFilePdf.eq(OSSFile::getBindId, listFile.get(0).getId()); + List list = ossFileService.list(queryOssFilePdf); + if (CollectionUtils.isEmpty(list)) { + byFileRows.setStandardUrl(getUrl(listFile.get(0), token)); + } else { + byFileRows.setStandardUrl(getUrl(list.get(0), token)); + } } } LambdaQueryWrapper querySarFileSplitInfoEo = new LambdaQueryWrapper<>(); @@ -588,7 +596,15 @@ public class SrmsApiServiceImpl implements SrmsApiService { List listOssFileOne = listOssFile.stream().filter(o -> Objects.equals(o.getStandardId(), standardPageVO.getId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listOssFileOne)) { listOssFileOne = listOssFileOne.stream().sorted(Comparator.comparing(OSSFile::getCreateTime).reversed()).collect(Collectors.toList()); - standardPageVO.setStandardUrl(getUrl(listOssFileOne.get(0), token)); + // 查找有没有pdf版本 + LambdaQueryWrapper queryOssFilePdf = new LambdaQueryWrapper<>(); + queryOssFilePdf.eq(OSSFile::getBindId, listOssFileOne.get(0).getId()); + List list = ossFileService.list(queryOssFilePdf); + if (CollectionUtils.isEmpty(list)) { + standardPageVO.setStandardUrl(getUrl(listOssFileOne.get(0), token)); + } else { + standardPageVO.setStandardUrl(getUrl(list.get(0), token)); + } } } // 零件号查询