diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDictTreeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDictTreeController.java index c8b610a9..b654f10e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDictTreeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDictTreeController.java @@ -43,8 +43,8 @@ public class LawsDictTreeController { @AutoLog(value = "树形结构-零部件树选中回显") @ApiOperation(value = "树形结构-零部件树选中回显", notes = "树形结构-零部件树选中回显") @PostMapping("/echo") - public Result> queryEcho(@RequestBody Map selectNodeCodes) { - List list = dictTreeService.queryEcho(selectNodeCodes.get("selectNodeCodes")); + public Result> queryEcho(@RequestBody Map map) { + List list = dictTreeService.queryEcho(map.get("selectNodeCodes"), map.get("dictId")); return Result.OK(list); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java index 0666066f..07b80313 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java @@ -10,6 +10,7 @@ import com.jero.modules.system.service.ISysDictService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -46,8 +47,11 @@ public class DictTreeService { return new TreePage<>(pageList.getRecords(), pageList.getTotal(), pageList.getSize(), pageList.getCurrent()); } - public List queryEcho(String selectNodeCodes) { - return null; + public List queryEcho(String selectNodeCodes, String dictId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDictItem::getDictId, dictId); + queryWrapper.in(SysDictItem::getItemValue, Arrays.asList(selectNodeCodes.split(","))); + return dictItemService.list(queryWrapper); } public List getChild(String dictItemId, String dictId) {