20250619 修改报表

This commit is contained in:
2025-06-19 11:45:21 +08:00
parent 1390e63fe2
commit a4b1a94dd9
17 changed files with 322 additions and 272 deletions
+24 -6
View File
@@ -293,7 +293,10 @@ namespace BLL
if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单
{
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
reMenuList = sysMenu.ToList();
if (sysMenu.Count() > 0)
{
reMenuList = sysMenu.ToList();
}
}
else
{
@@ -302,7 +305,10 @@ namespace BLL
where y.RoleId == user.RoleId
orderby x.SortIndex
select x;
reMenuList = sysMenuRole.ToList();
if (sysMenuRole.Count() > 0)
{
reMenuList = sysMenuRole.ToList();
}
// PM,EM,CM权限特殊处理
List<string> pm = (from x in Funs.DB.Editor_EProject select x.ProjectControl_ProjectManagerId).ToList();
@@ -312,13 +318,19 @@ namespace BLL
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.PMEditorMenuId select x).First();
reMenuList.Add(addMenu);
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
if (cm.Contains(user.UserId))
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.CMEditorMenuId select x).First();
reMenuList.Add(addMenu);
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
// 对资源模块的特殊处理:CTE/M具有RP权限
@@ -326,8 +338,14 @@ namespace BLL
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "72CDB9E2-F44B-4F96-A578-3271211FDC15" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ResourcePlanMenuId select x).First();
reMenuList.Add(addSupMenu);
reMenuList.Add(addMenu);
if (addSupMenu != null)
{
reMenuList.Add(addSupMenu);
}
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
}