From 05d79df9151127f89fc8540696da168d168092f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Thu, 26 Sep 2019 11:36:13 +0800
Subject: [PATCH] =?utf8?q?fix:=20=E8=A7=92=E8=89=B2=E6=8E=88=E6=9D=83?=
 =?utf8?q?=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=E6=A0=91?=
 =?utf8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminPermissionController.java      | 26 +++++++++----------
 .../domain/service/PermissionService.java     |  4 ++-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/controller/admin/AdminPermissionController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/controller/admin/AdminPermissionController.java
index 9706505..4181f3e 100644
--- a/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/controller/admin/AdminPermissionController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/controller/admin/AdminPermissionController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.supwisdom.institute.backend.base.api.v1.vo.response.PermissionTreeResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.base.domain.model.PermissionTreeNode;
 import com.supwisdom.institute.backend.base.domain.service.PermissionService;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
@@ -29,19 +30,16 @@ public class AdminPermissionController {
   @Autowired
   private PermissionService permissionService;
 
-//  @GetMapping(path = "/tree", produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
-//  @ResponseStatus(value = HttpStatus.OK)
-//  @ResponseBody
-//  public DefaultApiResponse<PermissionTreeResponseData> tree() {
-//    
-//    Map<String, Object> mapBean = new HashMap<String, Object>();
-//    //mapBean.put("type", Permission.TYPE_MENU);
-//
-//    PermissionTreeNode tree = permissionService.selectPermissionTree(mapBean);
-//
-//    PermissionTreeResponseData data = PermissionTreeResponseData.of(tree);
-//
-//    return new DefaultApiResponse<PermissionTreeResponseData>(data);
-//  }
+  @GetMapping(path = "/tree", produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+  @ResponseStatus(value = HttpStatus.OK)
+  @ResponseBody
+  public DefaultApiResponse<PermissionTreeResponseData> tree() {
+    
+    PermissionTreeNode tree = permissionService.selectPermissionTree(Permission.APPLICATION_ID, null);
+
+    PermissionTreeResponseData data = PermissionTreeResponseData.of(tree);
+
+    return new DefaultApiResponse<PermissionTreeResponseData>(data);
+  }
   
 }
diff --git a/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
index ff500bf..39fe4e2 100644
--- a/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
@@ -63,7 +63,9 @@ public class PermissionService extends ABaseService<Permission, PermissionReposi
   public PermissionTreeNode selectPermissionTree(String applicationId, String type) {
 
     Map<String, Object> mapBean = new HashMap<String, Object>();
-    mapBean.put("type", type);
+    if (StringUtils.isNotBlank(type)) {
+      mapBean.put("type", type);
+    }
     
     String rootTreeNodeId = "0";
     
-- 
2.17.1