合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
+6 -8
View File
@@ -100,13 +100,11 @@ namespace BLL
{
if (userId == Const.sysglyId || userId == Const.hfnbdId) ////|| getUser.DepartId == Const.Depart_constructionId
{
return new List<string>() { Const.Menu_Server, Const.Menu_HSSE, Const.Menu_CQMS, Const.Menu_HJGL,Const.Menu_PHTGL, Const.Menu_JDGL
,Const.Menu_DigitalSite,Const.Menu_PPerson,Const.Menu_PZHGL};
}
//else if (userId == Const.sedinId)
//{
// return new List<string>() { Const.Menu_CQMS };
//}
var getMenuType = from x in db.Sys_Const
where x.GroupId == ConstValue.Group_MenuType_S || x.GroupId == ConstValue.Group_MenuType_P
select x.ConstValue;
return getMenuType.ToList();
}
else
{
List<string> returnList = new List<string>();
@@ -222,7 +220,7 @@ namespace BLL
{
returnValue = true;
}
else if (menu.MenuType == Const.Menu_Personal)
else if (menu.MenuType == Const.Menu_Personal || menu.MenuType == Const.Menu_ToDo)
{
returnValue = true;
}