|
|
@@ -140,7 +140,12 @@ public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
}}; |
|
|
}}; |
|
|
String menus = wxMallMapper.queryMenusByTenantInfo(q); |
|
|
String menus = wxMallMapper.queryMenusByTenantInfo(q); |
|
|
JSONArray menuIdList = JSON.parseArray(menus); |
|
|
JSONArray menuIdList = JSON.parseArray(menus); |
|
|
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav); |
|
|
|
|
|
|
|
|
if (null != menuIdList) { |
|
|
|
|
|
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav); |
|
|
|
|
|
}else { |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
//用户菜单列表 |
|
|
//用户菜单列表 |
|
|
List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); |
|
|
List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); |
|
|
|