jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6de8b08c4b66cb0fededa081dfc693fd2cf528ce

Authored by jiangjiazhi
2 parents 7010aeba98 5e35320f9a
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java View file @ 6de8b08
... ... @@ -88,8 +88,11 @@
88 88 */
89 89 @RequestMapping(method = RequestMethod.GET, value = "/basicConfigTree")
90 90 @ResponseBody
91   - public List<TreeNode> findAllBasicConfigWithTree() {
92   - return basicConfigFacade.findAllBasicConfigWithTree();
  91 + public BaseListResponse findAllBasicConfigWithTree(BasicConfigQueryRequest basicConfigQueryRequest) {
  92 + if(null == basicConfigQueryRequest.getParentId()) {
  93 + basicConfigQueryRequest.setParentId("0");
  94 + }
  95 + return basicConfigFacade.findBasicConfigList(basicConfigQueryRequest);
93 96 }
94 97  
95 98 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 6de8b08
... ... @@ -35,13 +35,13 @@
35 35  
36 36 BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
37 37 basicConfigQuery.setNeed("1");
38   -// basicConfigQuery.setId(basicConfigQueryRequest.getId());
  38 + basicConfigQuery.setId(basicConfigQueryRequest.getId());
39 39 // basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId());
40 40 basicConfigQuery.setPage(basicConfigQueryRequest.getPage());
41 41 basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit());
42 42 basicConfigQuery.setYn(YnEnums.YES.getId());
43 43 basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords());
44   - basicConfigQuery.setParentId(basicConfigQueryRequest.getId());
  44 + basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId());
45 45 List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
46 46  
47 47 return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo());