diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java index bcb32eab..891b3547 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.laws.standard.entity.PartName; +import com.jero.modules.laws.standard.entity.TreePage; import com.jero.modules.laws.standard.service.ILawsPartNameService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,7 +31,24 @@ public class LawsPartNameController { @AutoLog(value = "企业标准-零部件树") @ApiOperation(value = "企业标准-零部件树", notes = "企业标准-零部件树") @GetMapping("/") - public Result> queryENTreeList( + public Result> queryENTreeList( + @RequestParam(name = "nodeName", required = false, defaultValue = "") @ApiParam("一级节点名称") String nodeName, + @RequestParam(name = "pageNo", defaultValue = "1") @ApiParam("页码") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") @ApiParam("页面大小") Integer pageSize) { + if (pageNo == null) { + pageNo = 1; + } + if (pageSize == null) { + pageSize = 5; + } + TreePage list = IPartNameService.queryTreeList(nodeName, pageNo, pageSize); + return Result.OK(list); + } + + @AutoLog(value = "企业标准-零部件树") + @ApiOperation(value = "企业标准-零部件树", notes = "企业标准-零部件树") + @GetMapping("/queryFirstList") + public Result> queryFirstList( @RequestParam(name = "nodeName", required = false, defaultValue = "") @ApiParam("节点名称") String nodeName) { List list = IPartNameService.queryList(nodeName); return Result.OK(list); diff --git a/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java b/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java index 26af048e..121a443b 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java @@ -151,6 +151,13 @@ public class LawsTag implements Serializable { @ApiModelProperty(value = "跳转URL") private String fieldHref; + /** + * 跳转URL + */ + @TableField(value = "tree_first_href") + @ApiModelProperty(value = "树形一级跳转URL") + private String treeFirstHref; + /** * 表单控件长度 */