fix: 修复菜单无法加载根节点问题

pull/9/head
Carina 4 years ago
parent 3d139772ea
commit 2c6d904201

@ -165,6 +165,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
menuModelList = Lists.newArrayList(); menuModelList = Lists.newArrayList();
// 生成根节点菜单 // 生成根节点菜单
MenuModel model = getGenMenuModel(); MenuModel model = getGenMenuModel();
parentId = model.getParentId();
menuModelList.add(model); menuModelList.add(model);
}else{ }else{
// 只查菜单 // 只查菜单
@ -209,6 +210,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
menuModelList = Lists.newArrayList(); menuModelList = Lists.newArrayList();
// 生成根节点菜单 // 生成根节点菜单
MenuModel model = getGenMenuModel(); MenuModel model = getGenMenuModel();
parentId = model.getParentId();
menuModelList.add(model); menuModelList.add(model);
}else{ }else{
QueryBuilder<SysMenu> queryBuilder = new GenQueryBuilder<>(); QueryBuilder<SysMenu> queryBuilder = new GenQueryBuilder<>();

@ -156,9 +156,9 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
List<SysOrgModel> orgModelList; List<SysOrgModel> orgModelList;
if(StringUtils.isEmpty(parentId)){ if(StringUtils.isEmpty(parentId)){
orgModelList = Lists.newArrayList(); orgModelList = Lists.newArrayList();
parentId = VIRTUAL_TOTAL_NODE;
// 生成根节点组织 // 生成根节点组织
SysOrgModel model = getGenOrgModel(); SysOrgModel model = getGenOrgModel();
parentId = model.getParentId();
orgModelList.add(model); orgModelList.add(model);
}else{ }else{
QueryBuilder<SysOrg> queryBuilder = new GenQueryBuilder<>(); QueryBuilder<SysOrg> queryBuilder = new GenQueryBuilder<>();
@ -192,9 +192,9 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
List<SysOrgModel> orgModelList = Lists.newArrayList(); List<SysOrgModel> orgModelList = Lists.newArrayList();
String parentId = PARENT_ID; String parentId = PARENT_ID;
if(isGen){ if(isGen){
parentId = VIRTUAL_TOTAL_NODE;
// 生成根节点组织 // 生成根节点组织
SysOrgModel model = getGenOrgModel(); SysOrgModel model = getGenOrgModel();
parentId = model.getParentId();
orgModelList.add(model); orgModelList.add(model);
} }

Loading…
Cancel
Save