From d3386ce4a4439ee740ca79d33ac7040963a18948 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 24 Apr 2020 11:31:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
index 8ae640b..600bd93 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java
@@ -65,9 +65,6 @@
return menus;
}
-
-
-
/**
* 修改菜单状态
*
@@ -117,9 +114,9 @@
for (SysMenu sysMenu : allMenus) {
Map<String, Object> authTree = new HashMap<>();
- authTree.put("id", sysMenu.getId());
+ authTree.put("id", sysMenu.getId().toString());
authTree.put("name", sysMenu.getName());
- authTree.put("pId", sysMenu.getParentId());
+ authTree.put("pId", sysMenu.getParentId().toString());
authTree.put("open", true);
authTree.put("checked", false);
if (roleMenusMap.get(sysMenu.getId()) != null) {
--
Gitblit v1.8.0