|
@@ -27,13 +27,13 @@ namespace Services
|
|
|
/// 获取所有菜单数(菜单管理)
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId)
|
|
|
+ public List<TreeSelectVo> SelectTreeMenuList(MenuQueryDto menu, long userId)
|
|
|
{
|
|
|
- if (menu.ParentId != null)
|
|
|
- {
|
|
|
- return GetMenusByMenuId(menu.ParentId.ParseToInt(), userId);
|
|
|
- }
|
|
|
- List<SysMenu> menuList = BuildMenuTree(SelectMenuList(menu, userId));
|
|
|
+ // if (menu.parentId != null)
|
|
|
+ // {
|
|
|
+ // return GetMenusByMenuId(menu.parentId.ParseToInt(), userId);
|
|
|
+ // }
|
|
|
+ List<TreeSelectVo> menuList = BuildMenuTreeSelect(SelectMenuList(menu, userId));
|
|
|
return menuList;
|
|
|
}
|
|
|
|
|
@@ -63,7 +63,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public SysMenu GetMenuByMenuId(int menuId)
|
|
|
{
|
|
|
- return GetFirst(it => it.MenuId == menuId);
|
|
|
+ return GetFirst(it => it.menuId == menuId);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -75,7 +75,7 @@ namespace Services
|
|
|
public List<SysMenu> GetMenusByMenuId(int menuId, long userId)
|
|
|
{
|
|
|
var menuExpression = Expressionable.Create<SysMenu>();
|
|
|
- menuExpression.And(c => c.ParentId == menuId);
|
|
|
+ menuExpression.And(c => c.parentId == menuId);
|
|
|
|
|
|
if (!SysRoleService.IsAdmin(userId))
|
|
|
{
|
|
@@ -83,12 +83,12 @@ namespace Services
|
|
|
var roleMenus = Context.Queryable<SysRoleMenu>()
|
|
|
.Where(r => userRoles.Contains(r.RoleId)).Select(s => s.MenuId).ToList();
|
|
|
|
|
|
- menuExpression.And(c => roleMenus.Contains(c.MenuId));
|
|
|
+ menuExpression.And(c => roleMenus.Contains(c.menuId));
|
|
|
}
|
|
|
- var list = GetList(menuExpression.ToExpression()).OrderBy(f => f.SortOrder).ToList();
|
|
|
+ var list = GetList(menuExpression.ToExpression()).OrderBy(f => f.sortOrder).ToList();
|
|
|
Context.ThenMapper(list, item =>
|
|
|
{
|
|
|
- item.SubNum = Context.Queryable<SysMenu>().SetContext(x => x.ParentId, () => item.MenuId, item).Count;
|
|
|
+ item.subNum = Context.Queryable<SysMenu>().SetContext(x => x.parentId, () => item.menuId, item).Count;
|
|
|
});
|
|
|
return list;
|
|
|
}
|
|
@@ -101,6 +101,7 @@ namespace Services
|
|
|
public long AddMenu(SysMenu menu)
|
|
|
{
|
|
|
menu.CreateTime = DateTime.Now;
|
|
|
+ menu.UpdateTime = DateTime.Now;
|
|
|
return InsertReturnBigIdentity(menu);
|
|
|
}
|
|
|
|
|
@@ -111,8 +112,9 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public long EditMenu(SysMenu menu)
|
|
|
{
|
|
|
- menu.Icon = string.IsNullOrEmpty(menu.Icon) ? "" : menu.Icon;
|
|
|
- return Update(menu, false);
|
|
|
+ menu.UpdateTime = DateTime.Now;
|
|
|
+ menu.icon = string.IsNullOrEmpty(menu.icon) ? "" : menu.icon;
|
|
|
+ return Update(menu, true);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -132,14 +134,14 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public string CheckMenuNameUnique(SysMenu menu)
|
|
|
{
|
|
|
- long menuId = menu.MenuId == 0 ? -1 : menu.MenuId;
|
|
|
- SysMenu info = GetFirst(it => it.Name == menu.Name && it.ParentId == menu.ParentId);
|
|
|
+ long menuId = menu.menuId == 0 ? -1 : menu.menuId;
|
|
|
+ SysMenu info = GetFirst(it => it.name == menu.name && it.parentId == menu.parentId);
|
|
|
|
|
|
//if (info != null && menuId != info.menuId && menu.menuName.Equals(info.menuName))
|
|
|
//{
|
|
|
// return UserConstants.NOT_UNIQUE;
|
|
|
//}
|
|
|
- if (info != null && info.MenuId != menu.MenuId)
|
|
|
+ if (info != null && info.menuId != menu.menuId)
|
|
|
{
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
}
|
|
@@ -153,7 +155,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public int ChangeSortMenu(MenuDto menuDto)
|
|
|
{
|
|
|
- return Update(new SysMenu() { MenuId = menuDto.MenuId, SortOrder = menuDto.SortOrder }, it => new { it.SortOrder });
|
|
|
+ return Update(new SysMenu() { menuId = menuDto.menuId, sortOrder = menuDto.sortOrder }, it => new { it.sortOrder });
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -163,7 +165,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public bool HasChildByMenuId(long menuId)
|
|
|
{
|
|
|
- return Count(it => it.ParentId == menuId) > 0;
|
|
|
+ return Count(it => it.parentId == menuId) > 0;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -173,7 +175,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public List<SysMenu> SelectMenuTreeByUserId(long userId)
|
|
|
{
|
|
|
- MenuQueryDto dto = new() { DelFlag = "0", MenuTypeIds = "M,C" };
|
|
|
+ MenuQueryDto dto = new() { delFlag = "0", menuTypeIds = "M,C" };
|
|
|
if (SysRoleService.IsAdmin(userId))
|
|
|
{
|
|
|
return SelectTreeMenuList(dto);
|
|
@@ -193,16 +195,16 @@ namespace Services
|
|
|
public List<string> SelectMenuPermsByUserId(long userId)
|
|
|
{
|
|
|
var menus = Context.Queryable<SysMenu, SysRoleMenu, SysUserRole, SysRole>((m, rm, ur, r) => new JoinQueryInfos(
|
|
|
- JoinType.Left, m.MenuId == rm.MenuId,
|
|
|
+ JoinType.Left, m.menuId == rm.MenuId,
|
|
|
JoinType.Left, rm.RoleId == ur.RoleId,
|
|
|
JoinType.Left, ur.RoleId == r.RoleId
|
|
|
))
|
|
|
.WithCache(60 * 10)
|
|
|
.Where((m, rm, ur, r) => m.DelFlag == "0" && ur.UserId == userId)
|
|
|
.Select((m, rm, ur, r) => m).ToList();
|
|
|
- var menuList = menus.Where(f => !string.IsNullOrEmpty(f.Permission));
|
|
|
+ var menuList = menus.Where(f => !string.IsNullOrEmpty(f.permission));
|
|
|
|
|
|
- return menuList.Select(x => x.Permission).Distinct().ToList();
|
|
|
+ return menuList.Select(x => x.permission).Distinct().ToList();
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -218,14 +220,14 @@ namespace Services
|
|
|
.Select(f => f.MenuId).Distinct().ToList();
|
|
|
|
|
|
return Queryable()
|
|
|
- .Where(c => roleMenus.Contains(c.MenuId))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.MenuName), (c) => c.Name.Contains(menu.MenuName))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.Visible), (c) => c.Visible == menu.Visible)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.DelFlag), (c) => c.DelFlag == menu.DelFlag)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.MenuTypeIds), c => menu.MenuTypeIdArr.Contains(c.MenuType))
|
|
|
- .OrderBy((c) => new { c.ParentId, c.SortOrder })
|
|
|
+ .Where(c => roleMenus.Contains(c.menuId))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.menuName), (c) => c.name.Contains(menu.menuName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.visible), (c) => c.visible == menu.visible)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.delFlag), (c) => c.DelFlag == menu.delFlag)
|
|
|
+ // .WhereIF(!string.IsNullOrEmpty(menu.menuTypeIds), c => menu.menuTypeIdArr.Contains(c.menuType))
|
|
|
+ .OrderBy((c) => new { c.parentId, c.sortOrder })
|
|
|
.Select(c => c)
|
|
|
- .ToTree(it => it.Children, it => it.ParentId, 0);
|
|
|
+ .ToTree(it => it.children, it => it.parentId, 0);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -241,16 +243,16 @@ namespace Services
|
|
|
.Select(f => f.MenuId).Distinct().ToList();
|
|
|
|
|
|
return Context.Queryable<SysMenu>()
|
|
|
- .InnerJoin<SysMenu>((t1, t2) => t1.MenuId == t2.ParentId)
|
|
|
- .InnerJoin<SysMenu>((t1, t2, t3) => t2.MenuId == t3.ParentId)
|
|
|
- .Where((t1, t2, t3) => menuIds.Contains(t1.MenuId))
|
|
|
+ .InnerJoin<SysMenu>((t1, t2) => t1.menuId == t2.parentId)
|
|
|
+ .InnerJoin<SysMenu>((t1, t2, t3) => t2.menuId == t3.parentId)
|
|
|
+ .Where((t1, t2, t3) => menuIds.Contains(t1.menuId))
|
|
|
.Select((t1, t2, t3) => new RoleMenuExportDto()
|
|
|
{
|
|
|
- MenuName = $"{t1.Name}->{t2.Name}->{t3.Name}",
|
|
|
- Path = t2.Path,
|
|
|
- Component = t2.Path,
|
|
|
- Perms = t3.Permission,
|
|
|
- MenuType = (MenuType)(object)t3.MenuType,
|
|
|
+ MenuName = $"{t1.name}->{t2.name}->{t3.name}",
|
|
|
+ Path = t2.path,
|
|
|
+ Component = t2.path,
|
|
|
+ Perms = t3.permission,
|
|
|
+ MenuType = (MenuType)(object)t3.menuType,
|
|
|
Status = (MenuStatus)(object)t3.DelFlag
|
|
|
}).ToList();
|
|
|
}
|
|
@@ -262,15 +264,15 @@ namespace Services
|
|
|
private List<SysMenu> SelectMenuList(MenuQueryDto menu)
|
|
|
{
|
|
|
var menuExp = Expressionable.Create<SysMenu>();
|
|
|
- menuExp.AndIF(!string.IsNullOrEmpty(menu.MenuName), it => it.Name.Contains(menu.MenuName));
|
|
|
- menuExp.AndIF(!string.IsNullOrEmpty(menu.Visible), it => it.Visible == menu.Visible);
|
|
|
- menuExp.AndIF(!string.IsNullOrEmpty(menu.DelFlag), it => it.DelFlag == menu.DelFlag);
|
|
|
- menuExp.AndIF(!string.IsNullOrEmpty(menu.MenuTypeIds), it => menu.MenuTypeIdArr.Contains(it.MenuType));
|
|
|
- menuExp.AndIF(menu.ParentId != null, it => it.ParentId == menu.ParentId);
|
|
|
+ menuExp.AndIF(!string.IsNullOrEmpty(menu.menuName), it => it.name.Contains(menu.menuName));
|
|
|
+ menuExp.AndIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible);
|
|
|
+ menuExp.AndIF(!string.IsNullOrEmpty(menu.delFlag), it => it.DelFlag == menu.delFlag);
|
|
|
+ // menuExp.AndIF(!string.IsNullOrEmpty(menu.menuTypeIds), it => menu.menuTypeIdArr.Contains(it.menuType));
|
|
|
+ menuExp.AndIF(menu.parentId != null, it => it.parentId == menu.parentId);
|
|
|
|
|
|
return Queryable()
|
|
|
.Where(menuExp.ToExpression())
|
|
|
- .OrderBy(it => new { it.ParentId, it.SortOrder })
|
|
|
+ .OrderBy(it => new { it.parentId, it.sortOrder })
|
|
|
.ToList();
|
|
|
}
|
|
|
|
|
@@ -286,11 +288,11 @@ namespace Services
|
|
|
.Where(r => roles.Contains(r.RoleId));
|
|
|
|
|
|
return Queryable()
|
|
|
- .InnerJoin(roleMenus, (c, j) => c.MenuId == j.MenuId)
|
|
|
+ .InnerJoin(roleMenus, (c, j) => c.menuId == j.MenuId)
|
|
|
.Where((c, j) => c.DelFlag == "0")
|
|
|
- .WhereIF(!string.IsNullOrEmpty(sysMenu.MenuName), (c, j) => c.Name.Contains(sysMenu.MenuName))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(sysMenu.Visible), (c, j) => c.Visible == sysMenu.Visible)
|
|
|
- .OrderBy((c, j) => new { c.ParentId, c.SortOrder })
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(sysMenu.menuName), (c, j) => c.name.Contains(sysMenu.menuName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(sysMenu.visible), (c, j) => c.visible == sysMenu.visible)
|
|
|
+ .OrderBy((c, j) => new { c.parentId, c.sortOrder })
|
|
|
.Select(c => c)
|
|
|
.ToList();
|
|
|
}
|
|
@@ -301,17 +303,17 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public List<SysMenu> SelectTreeMenuList(MenuQueryDto menu)
|
|
|
{
|
|
|
- int parentId = menu.ParentId != null ? (int)menu.ParentId : 0;
|
|
|
+ int parentId = menu.parentId != null ? (int)menu.parentId : 0;
|
|
|
|
|
|
var list = Queryable()
|
|
|
.WithCache(60 * 10)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.MenuName), it => it.Name.Contains(menu.MenuName))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.Visible), it => it.Visible == menu.Visible)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.DelFlag), it => it.DelFlag == menu.DelFlag)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(menu.MenuTypeIds), it => menu.MenuTypeIdArr.Contains(it.MenuType))
|
|
|
- .WhereIF(menu.ParentId != null, it => it.ParentId == menu.ParentId)
|
|
|
- .OrderBy(it => new { it.ParentId, it.SortOrder })
|
|
|
- .ToTree(it => it.Children, it => it.ParentId, parentId);
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.menuName), it => it.name.Contains(menu.menuName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.visible), it => it.visible == menu.visible)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(menu.delFlag), it => it.DelFlag == menu.delFlag)
|
|
|
+ // .WhereIF(!string.IsNullOrEmpty(menu.menuTypeIds), it => menu.menuTypeIdArr.Contains(it.menuType))
|
|
|
+ .WhereIF(menu.parentId != null, it => it.parentId == menu.parentId)
|
|
|
+ .OrderBy(it => new { it.parentId, it.sortOrder })
|
|
|
+ .ToTree(it => it.children, it => it.parentId, parentId);
|
|
|
|
|
|
return list;
|
|
|
}
|
|
@@ -346,7 +348,11 @@ namespace Services
|
|
|
{
|
|
|
//得到子节点列表
|
|
|
List<SysMenu> childList = GetChildList(list, t);
|
|
|
- t.Children = childList;
|
|
|
+ t.children = childList;
|
|
|
+ t.meta = new TreeSelectMeta();
|
|
|
+ t.meta.title = t.name;
|
|
|
+ t.meta.icon = t.icon;
|
|
|
+ t.id = t.menuId;
|
|
|
foreach (var item in childList)
|
|
|
{
|
|
|
if (GetChildList(list, item).Count() > 0)
|
|
@@ -364,7 +370,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
private List<SysMenu> GetChildList(List<SysMenu> list, SysMenu sysMenu)
|
|
|
{
|
|
|
- return list.Where(p => p.ParentId == sysMenu.MenuId).ToList();
|
|
|
+ return list.Where(p => p.parentId == sysMenu.menuId).ToList();
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -381,16 +387,16 @@ namespace Services
|
|
|
{
|
|
|
RouterVo router = new()
|
|
|
{
|
|
|
- Hidden = "1".Equals(menu.Visible),
|
|
|
+ Hidden = "1".Equals(menu.visible),
|
|
|
Name = GetRouteName(menu),
|
|
|
Path = GetRoutePath(menu),
|
|
|
Component = GetComponent(menu),
|
|
|
- Meta = new Meta(menu.Name, menu.Icon, "1".Equals(menu.KeepAlive), menu.EnName, menu.Path, menu.CreateTime.Value)
|
|
|
+ Meta = new Meta(menu.name, menu.icon, "1".Equals(menu.keepAlive), menu.enName, menu.path, menu.CreateTime.Value)
|
|
|
};
|
|
|
|
|
|
- List<SysMenu> cMenus = menu.Children;
|
|
|
+ List<SysMenu> cMenus = menu.children;
|
|
|
//是目录并且有子菜单
|
|
|
- if (cMenus != null && cMenus.Count > 0 && UserConstants.TYPE_DIR.Equals(menu.MenuType))
|
|
|
+ if (cMenus != null && cMenus.Count > 0 && UserConstants.TYPE_DIR.Equals(menu.menuType))
|
|
|
{
|
|
|
router.AlwaysShow = true;
|
|
|
router.Redirect = "noRedirect";
|
|
@@ -402,24 +408,24 @@ namespace Services
|
|
|
List<RouterVo> childrenList = new();
|
|
|
RouterVo children = new()
|
|
|
{
|
|
|
- Path = menu.Path,
|
|
|
- Name = string.IsNullOrEmpty(menu.Path) ? "" : menu.Path.ToLower(),
|
|
|
- Meta = new Meta(menu.Name, menu.Icon, "1".Equals(menu.KeepAlive), menu.EnName, menu.Path, menu.CreateTime.Value)
|
|
|
+ Path = menu.path,
|
|
|
+ Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
|
|
|
+ Meta = new Meta(menu.name, menu.icon, "1".Equals(menu.keepAlive), menu.enName, menu.path, menu.CreateTime.Value)
|
|
|
};
|
|
|
childrenList.Add(children);
|
|
|
router.Children = childrenList;
|
|
|
}
|
|
|
- else if (menu.ParentId == 0 && IsInnerLink(menu))
|
|
|
+ else if (menu.parentId == 0 && IsInnerLink(menu))
|
|
|
{
|
|
|
- router.Meta = new Meta(menu.Name, menu.Icon);
|
|
|
+ router.Meta = new Meta(menu.name, menu.icon);
|
|
|
router.Path = "/";
|
|
|
List<RouterVo> childrenList = new();
|
|
|
RouterVo children = new();
|
|
|
- string routerPath = InnerLinkReplaceEach(menu.Path);
|
|
|
+ string routerPath = InnerLinkReplaceEach(menu.path);
|
|
|
children.Path = routerPath;
|
|
|
children.Component = UserConstants.INNER_LINK;
|
|
|
children.Name = routerPath.ToLower();
|
|
|
- children.Meta = new Meta(menu.Name, menu.Icon, menu.Path);
|
|
|
+ children.Meta = new Meta(menu.name, menu.icon, menu.path);
|
|
|
childrenList.Add(children);
|
|
|
router.Children = childrenList;
|
|
|
}
|
|
@@ -437,16 +443,16 @@ namespace Services
|
|
|
public List<SysMenu> BuildMenuTree(List<SysMenu> menus)
|
|
|
{
|
|
|
List<SysMenu> returnList = new();
|
|
|
- List<long> tempList = menus.Select(f => f.MenuId).ToList();
|
|
|
+ List<long> tempList = menus.Select(f => f.menuId).ToList();
|
|
|
|
|
|
foreach (var menu in menus)
|
|
|
{
|
|
|
// 如果是顶级节点, 遍历该父节点的所有子节点
|
|
|
- if (!tempList.Contains(menu.ParentId))
|
|
|
+ if (!tempList.Contains(menu.parentId))
|
|
|
{
|
|
|
- var menuInfo = menus.Find(f => f.MenuId == menu.MenuId);
|
|
|
+ var menuInfo = menus.Find(f => f.menuId == menu.menuId);
|
|
|
//移除按钮没有上级
|
|
|
- if (!tempList.Contains(menuInfo.ParentId) && menu.MenuType != "F")
|
|
|
+ if (!tempList.Contains(menuInfo.parentId) && menu.menuType != "F")
|
|
|
{
|
|
|
RecursionFn(menus, menu);
|
|
|
returnList.Add(menu);
|
|
@@ -483,7 +489,7 @@ namespace Services
|
|
|
/// <returns>路由名称</returns>
|
|
|
public string GetRouteName(SysMenu menu)
|
|
|
{
|
|
|
- string routerName = menu.Path.ToLower();
|
|
|
+ string routerName = menu.path.ToLower();
|
|
|
// 非外链并且是一级目录(类型为目录)
|
|
|
if (IsMeunFrame(menu))
|
|
|
{
|
|
@@ -499,17 +505,17 @@ namespace Services
|
|
|
/// <returns>路由地址</returns>
|
|
|
public string GetRoutePath(SysMenu menu)
|
|
|
{
|
|
|
- string routerPath = menu.Path;
|
|
|
+ string routerPath = menu.path;
|
|
|
// 内链打开外网方式
|
|
|
- if (menu.ParentId != 0 && IsInnerLink(menu))
|
|
|
+ if (menu.parentId != 0 && IsInnerLink(menu))
|
|
|
{
|
|
|
routerPath = InnerLinkReplaceEach(routerPath);
|
|
|
}
|
|
|
// 非外链并且是一级目录(类型为目录)
|
|
|
- if (0 == menu.ParentId && UserConstants.TYPE_DIR.Equals(menu.MenuType)
|
|
|
- && UserConstants.NO_FRAME.Equals(menu.Embedded))
|
|
|
+ if (0 == menu.parentId && UserConstants.TYPE_DIR.Equals(menu.menuType)
|
|
|
+ && UserConstants.NO_FRAME.Equals(menu.embedded))
|
|
|
{
|
|
|
- routerPath = "/" + menu.Path;
|
|
|
+ routerPath = "/" + menu.path;
|
|
|
}
|
|
|
else if (IsMeunFrame(menu))// 非外链并且是一级目录(类型为菜单)
|
|
|
{
|
|
@@ -548,8 +554,8 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public bool IsMeunFrame(SysMenu menu)
|
|
|
{
|
|
|
- return menu.ParentId == 0 && UserConstants.TYPE_MENU.Equals(menu.MenuType)
|
|
|
- && menu.Embedded.Equals(UserConstants.NO_FRAME);
|
|
|
+ return menu.parentId == 0 && UserConstants.TYPE_MENU.Equals(menu.menuType)
|
|
|
+ && menu.embedded.Equals(UserConstants.NO_FRAME);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -559,7 +565,7 @@ namespace Services
|
|
|
/// <returns>结果</returns>
|
|
|
public bool IsInnerLink(SysMenu menu)
|
|
|
{
|
|
|
- return menu.Embedded.Equals(UserConstants.NO_FRAME) && Tools.IsUrl(menu.Path);
|
|
|
+ return menu.embedded.Equals(UserConstants.NO_FRAME) && Tools.IsUrl(menu.path);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -569,7 +575,7 @@ namespace Services
|
|
|
/// <returns></returns>
|
|
|
public bool IsParentView(SysMenu menu)
|
|
|
{
|
|
|
- return menu.ParentId != 0 && UserConstants.TYPE_DIR.Equals(menu.MenuType);
|
|
|
+ return menu.parentId != 0 && UserConstants.TYPE_DIR.Equals(menu.menuType);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|