diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 0b5ce82e..f91e8f19 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -143,6 +143,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-导出", notes="国内法规标准-导出") @PostMapping("/exportData") public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "国标导出", "国标导出"); } @@ -150,6 +151,7 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-带文件导出", notes="国内法规标准-带文件导出") @PostMapping("/exportDataWithFile") public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "国标导出", "国标导出"); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 0936bb66..4104bf5a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -143,6 +143,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-导出", notes="海外法规标准-导出") @PostMapping("/exportData") public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "外标导出", "外标导出"); } @@ -150,6 +151,7 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-带文件导出", notes="海外法规标准-带文件导出") @PostMapping("/exportDataWithFile") public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "外标导出", "外标导出"); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml index 22997d57..87b6cc8a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml @@ -26,7 +26,8 @@ AND (lnf.release_status = 1 OR lnf.writer = #{param.writer}) - AND ((lnf.release_status = 1 AND lpr.user_id = #{param.writer}) OR lnf.writer = #{param.writer}) + AND ((lnf.release_status = 1 AND (lpr.user_id = #{param.writer} OR lnf.push_range_flag = 2)) + OR lnf.writer = #{param.writer}) AND lnf.dynamic_heading LIKE CONCAT('%', #{param.dynamicHeading}, '%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java index e8680637..42c7164d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java @@ -146,10 +146,14 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl treeNodeList = lawsTreeNodeService.list(treeQueryWrapper); nodeRelationList.forEach(nodeRelation -> { - String nodeName = treeNodeList.stream().filter(treeNode -> - nodeRelation.getNodeId().equals(treeNode.getId())) - .collect(Collectors.toList()).get(0).getNodeName(); - nodeRelation.setNodeName(nodeName); + List nodeList = treeNodeList.stream().filter(treeNode -> + nodeRelation.getNodeId().equals(treeNode.getId())) + .collect(Collectors.toList()); + if (CollectionUtils.isEmpty(nodeList)) { + nodeRelation.setNodeName(""); + } else { + nodeRelation.setNodeName(nodeList.get(0).getNodeName()); + } }); return nodeRelationList; }