shecs/Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_FCL

Browse Source
This commit is contained in:
佘春生
2025-06-09 09:42:46 +08:00
parent ba6a6a2b60 fbcfd95f73
commit 9660782a6e
36 changed files with 2027 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FCL/BLL/Common/CommonService.cs
+16 -6
View File
@@ -125,11 +125,11 @@ namespace BLL
return isPower;
}
#endregion
#region 根据登陆id和系统id得到菜单列表
/// <summary>
/// 本项目用这个方法来获取权限（不按项目角色和项目用户来获取权限）
@@ -145,8 +145,11 @@ namespace BLL
{
if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单
{
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
reMenuList = sysMenu.ToList();
var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x;
if (sysMenu.Count() > 0)
{
reMenuList = sysMenu.ToList();
}
}
else
{
@@ -155,7 +158,10 @@ namespace BLL
where y.RoleId == user.RoleId
orderby x.SortIndex
select x;
reMenuList = sysMenuRole.ToList();
if (sysMenuRole.Count() > 0)
{
reMenuList = sysMenuRole.ToList();
}
// 对主协调员权限特殊处理
List<string> mc = (from x in Funs.DB.FC_SESRelatedData select x.Main_Coordinator).ToList();
@@ -163,11 +169,15 @@ namespace BLL
{
Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "21FCD41E-2E96-4DE0-8F5F-BDD0C967134F" select x).First();
Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ContractorQualificationMenuId select x).First();
reMenuList.Add(addMenu);
if (addMenu != null)
{
reMenuList.Add(addMenu);
}
}
}
}
reMenuList = reMenuList.Distinct().OrderBy(x => x.SortIndex).ToList();
return reMenuList;
}
#endregion
FCL/BLL/SES/PunishmentService.cs
+14
View File
@@ -70,6 +70,13 @@ namespace BLL
newPunishment.SeType = punishment.SeType;
newPunishment.PVTRequester = punishment.PVTRequester;
newPunishment.IndividualSESReason = punishment.IndividualSESReason;
newPunishment.SSRAdminId = punishment.SSRAdminId;
newPunishment.SSRStaratDate = punishment.SSRStaratDate;
newPunishment.SSREndDate=punishment.SSREndDate;
newPunishment.MainCoordinatorStartDate = punishment.MainCoordinatorStartDate;
newPunishment.MainCoordinatorEndDate = punishment.MainCoordinatorEndDate;
newPunishment.UserDepStartDate = punishment.UserDepStartDate;
newPunishment.UserDepEndDate = punishment.UserDepEndDate;
Funs.DB.EMC_Punishment.InsertOnSubmit(newPunishment);
Funs.DB.SubmitChanges();
@@ -116,6 +123,13 @@ namespace BLL
newPunishment.SeType = punishment.SeType;
newPunishment.PVTRequester = punishment.PVTRequester;
newPunishment.IndividualSESReason = punishment.IndividualSESReason;
newPunishment.SSRAdminId = punishment.SSRAdminId;
newPunishment.SSRStaratDate = punishment.SSRStaratDate;
newPunishment.SSREndDate = punishment.SSREndDate;
newPunishment.MainCoordinatorStartDate = punishment.MainCoordinatorStartDate;
newPunishment.MainCoordinatorEndDate = punishment.MainCoordinatorEndDate;
newPunishment.UserDepStartDate = punishment.UserDepStartDate;
newPunishment.UserDepEndDate = punishment.UserDepEndDate;
Funs.DB.SubmitChanges();
}