From d01548ccee8f32c50bc850faa22f7619e83af483 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Sun, 1 May 2016 10:38:15 +0800
Subject: [PATCH] platform permission        add return pageinfo

---
 .../platform/operate/web/controller/BasicConfigController.java     | 7 +++++--
 .../com/lyms/platform/operate/web/facade/BasicConfigFacade.java    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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<TreeNode> 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<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
 
         return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo());
-- 
1.8.3.1