diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index 97db12b..c8751e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -88,8 +88,11 @@ public class BasicConfigController extends RestController { */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfigTree") @ResponseBody - public List findAllBasicConfigWithTree() { - return basicConfigFacade.findAllBasicConfigWithTree(); + public BaseListResponse findAllBasicConfigWithTree(BasicConfigQueryRequest basicConfigQueryRequest) { + if(null == basicConfigQueryRequest.getParentId()) { + basicConfigQueryRequest.setParentId("0"); + } + return basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 479a729..0b0e2bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -35,13 +35,13 @@ public class BasicConfigFacade { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setNeed("1"); -// basicConfigQuery.setId(basicConfigQueryRequest.getId()); + basicConfigQuery.setId(basicConfigQueryRequest.getId()); // basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId()); basicConfigQuery.setPage(basicConfigQueryRequest.getPage()); basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit()); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords()); - basicConfigQuery.setParentId(basicConfigQueryRequest.getId()); + basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId()); List data = basicConfigService.queryBasicConfig(basicConfigQuery); return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo());