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 545003ae..177b6e18 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 @@ -37,10 +37,11 @@ public class LawsPartNameController { @ApiOperation(value = "企业标准-零部件树", notes = "企业标准-零部件树") @GetMapping("/") public Result> queryENTreeList( - @RequestParam(required = false, defaultValue = "") @ApiParam("一级节点名称") String nodeName, + @RequestParam(name = "selectNodeNames", required = false, defaultValue = "") @ApiParam("选中的节点名称") String selectNodeNames, + @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) { - TreePage list = partNameService.queryTreeList(nodeName, pageNo, pageSize); + TreePage list = partNameService.queryTreeList(selectNodeNames, nodeName, pageNo, pageSize); return Result.OK(list); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java index fc929ac3..a40ae61e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java @@ -23,5 +23,5 @@ public interface PartNameService extends IService { * @param pageSize * @return */ - TreePage queryTreeList(String nodeName, Integer pageNo, Integer pageSize); + TreePage queryTreeList(String selectedNodeNames, String nodeName, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java index 35514fff..8ebe9244 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java @@ -36,10 +36,11 @@ public class PartNameServiceImpl extends ServiceImpl private PartNameMapper partNameMapper; @Override - public TreePage queryTreeList(String nodeName, Integer pageNo, Integer pageSize) { + public TreePage queryTreeList(String selectedNodeNames, String nodeName, Integer pageNo, Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PartName::getDelFlag, YesOrNoEnum.NO.getValue()) - .like(StrUtil.isNotBlank(nodeName), PartName::getName, nodeName); + .like(StrUtil.isNotBlank(nodeName), PartName::getName, nodeName) + .in(StrUtil.isNotBlank(selectedNodeNames), PartName::getName, selectedNodeNames.split(",")); List allNodes = partNameMapper.selectList(queryWrapper); // 将所有节点转换为映射,以便快速查找 diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index 6ad45cdf..4cd910c2 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -48,9 +48,6 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl