|
@@ -226,6 +226,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
router.setName(getRouteName(menu));
|
|
|
router.setPath(getRouterPath(menu));
|
|
|
router.setComponent(getComponent(menu));
|
|
|
+ router.setOrderNum(menu.getOrderNum());
|
|
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
List<SysMenu> cMenus = menu.getChildren();
|
|
|
if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
|
|
@@ -239,6 +240,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(menu.getPath());
|
|
|
children.setComponent(menu.getComponent());
|
|
|
children.setName(StringUtils.capitalize(menu.getPath()));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|
|
@@ -251,6 +253,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(routerPath);
|
|
|
children.setComponent(UserConstants.INNER_LINK);
|
|
|
children.setName(StringUtils.capitalize(routerPath));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|
|
@@ -278,6 +281,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
platformRouterVo.setPlatformId(platformVo.getId());
|
|
|
platformRouterVo.setPlatformName(platformVo.getPlatformName());
|
|
|
platformRouterVo.setIcon(platformVo.getIcon());
|
|
|
+ platformRouterVo.setOrderNum(platformVo.getOrderNum());
|
|
|
List<SysMenu> menus1 = this.selectMenuTreeByUserIdOne1(tenantId,
|
|
|
platformVo.getId());
|
|
|
List<RouterVo> routers = new LinkedList<RouterVo>();
|
|
@@ -287,6 +291,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
router.setName(getRouteName(menu));
|
|
|
router.setPath(getRouterPath(menu));
|
|
|
router.setComponent(getComponent(menu));
|
|
|
+ router.setOrderNum(menu.getOrderNum());
|
|
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
List<SysMenu> cMenus = menu.getChildren();
|
|
|
if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
|
|
@@ -300,6 +305,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(menu.getPath());
|
|
|
children.setComponent(menu.getComponent());
|
|
|
children.setName(StringUtils.capitalize(menu.getPath()));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|
|
@@ -312,6 +318,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(routerPath);
|
|
|
children.setComponent(UserConstants.INNER_LINK);
|
|
|
children.setName(StringUtils.capitalize(routerPath));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|
|
@@ -339,6 +346,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
platformRouterVo.setPlatformId(platformVo.getId());
|
|
|
platformRouterVo.setPlatformName(platformVo.getPlatformName());
|
|
|
platformRouterVo.setIcon(platformVo.getIcon());
|
|
|
+ platformRouterVo.setOrderNum(platformVo.getOrderNum());
|
|
|
List<SysMenu> menus1 = this.selectMenuTreeByUserId1(userId,
|
|
|
platformVo.getId().longValue(), tenantId);
|
|
|
List<RouterVo> routers = new LinkedList<RouterVo>();
|
|
@@ -348,6 +356,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
router.setName(getRouteName(menu));
|
|
|
router.setPath(getRouterPath(menu));
|
|
|
router.setComponent(getComponent(menu));
|
|
|
+ router.setOrderNum(menu.getOrderNum());
|
|
|
router.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
List<SysMenu> cMenus = menu.getChildren();
|
|
|
if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
|
|
@@ -361,6 +370,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(menu.getPath());
|
|
|
children.setComponent(menu.getComponent());
|
|
|
children.setName(StringUtils.capitalize(menu.getPath()));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|
|
@@ -373,6 +383,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
|
|
|
children.setPath(routerPath);
|
|
|
children.setComponent(UserConstants.INNER_LINK);
|
|
|
children.setName(StringUtils.capitalize(routerPath));
|
|
|
+ children.setOrderNum(menu.getOrderNum());
|
|
|
children.setMeta(new MetaVo(menu.getMenuName(), menu.getMenuAliasName(), menu.getIcon(), menu.getPath(), menu.getIsFrame(), menu.getIsNew(), menu.getRemark()));
|
|
|
childrenList.add(children);
|
|
|
router.setChildren(childrenList);
|