diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java index 7ac1ab96..19d628cb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java @@ -40,11 +40,12 @@ public class LawsTreeNodeController extends JeroController> queryENTreeList(@RequestParam(required = false) String nodeName) { + public Result> queryENTreeList(@RequestParam(required = false) String nodeName, + @RequestParam(required = false) String option) { String moduleCode = "EN"; Result> result = new Result<>(); try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); result.setResult(list); result.setSuccess(true); } catch (Exception e) { @@ -133,11 +134,12 @@ public class LawsTreeNodeController extends JeroController> queryGBTreeList(@RequestParam(required = false) String nodeName) { + public Result> queryGBTreeList(@RequestParam(required = false) String nodeName, + @RequestParam(required = false) String option) { String moduleCode = "GB"; Result> result = new Result<>(); try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); result.setResult(list); result.setSuccess(true); } catch (Exception e) { @@ -226,11 +228,12 @@ public class LawsTreeNodeController extends JeroController> queryFBTreeList(@RequestParam(required = false) String nodeName) { + public Result> queryFBTreeList(@RequestParam(required = false) String nodeName, + @RequestParam(required = false) String option) { String moduleCode = "FB"; Result> result = new Result<>(); try { - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName); + List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); result.setResult(list); result.setSuccess(true); } catch (Exception e) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java index c42cba29..4aac1c79 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java @@ -19,7 +19,7 @@ public interface ILawsTreeNodeService extends IService { * * @return */ - List queryTreeNodeList(String moduleCode, String nodeName); + List queryTreeNodeList(String moduleCode, String nodeName, String option); /** * 新增 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index d1ca439f..279f5b11 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper; import com.jero.modules.laws.standard.mapper.LawsTreeNodeMapper; import com.jero.modules.laws.standard.service.ILawsTreeNodeService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; @@ -37,7 +38,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl queryTreeNodeList(String moduleCode, String nodeName) { + public List queryTreeNodeList(String moduleCode, String nodeName, String option) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); query.eq(LawsTreeNode::getModuleCode, moduleCode); @@ -68,8 +69,12 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl