diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 151f4b24..fc4bdba3 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2724,19 +2724,32 @@ namespace BLL #endregion #endregion - #region 综合管理 + #region 实名制考勤 /// /// 同步设置 /// - public const string RealNameSynchroSetMenuId = "13F11D51-1B54-400F-BDBB-36685BC94819"; + public const string ServerRealNameSynchroSetMenuId = "1E451E0C-A125-4117-B8AC-14E74011B52B"; /// /// 基础数据 /// - public const string RealNameBasicDataMenuId = "C0B52610-ED93-4881-AC61-1764C243F84A"; + public const string ServerRealNameBasicDataMenuId = "C0B52610-ED93-4881-AC61-1764C243F84A"; /// /// 同步记录 /// - public const string RealNameSynchroRecordMenuId = "F36E6C54-E39F-4032-874D-548EE090A35B"; + public const string ServerRealNameSynchroRecordMenuId = "F36E6C54-E39F-4032-874D-548EE090A35B"; + + /// + /// 同步设置 + /// + public const string ProjectRealNameSynchroSetMenuId = "ECC3A343-A0CC-48BB-BA81-904FE2BE8D9B"; + /// + /// 基础数据 + /// + public const string ProjectRealNameBasicDataMenuId = "86369F0D-0E01-4206-BF62-60A29B880EF5"; + /// + /// 同步记录 + /// + public const string ProjectRealNameSynchroRecordMenuId = "46B15547-BB67-43F8-86AE-D8DB8928EFE4"; #endregion /// @@ -2745,6 +2758,7 @@ namespace BLL public const string GJSXMenuId = "0BEA2126-7A48-40EB-8E21-99148E91A22B"; #endregion + #region 模版文件原始的虚拟路径 /// /// Excel附件路径 @@ -4846,20 +4860,7 @@ namespace BLL /// public const int GLCNProfessionalId = 23; - #region 项目考勤 - /// - /// 同步设置 - /// - public const string ServerRealNameSynchroSetMenuId = "ECC3A343-A0CC-48BB-BA81-904FE2BE8D9B"; - /// - /// 基础数据 - /// - public const string ServerRealNameBasicDataMenuId = "86369F0D-0E01-4206-BF62-60A29B880EF5"; - /// - /// 同步记录 - /// - public const string ServerRealNameSynchroRecordMenuId = "46B15547-BB67-43F8-86AE-D8DB8928EFE4"; - #endregion + /// /// 不参与规则设置菜单 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx.cs index 838b25e1..679aaa35 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.ZHGL.RealName /// private void GetButtonPower() { - string menuId = !string.IsNullOrEmpty(this.CurrUser.LoginProjectId) ? Const.RealNameBasicDataMenuId : Const.ServerRealNameBasicDataMenuId; + string menuId = !string.IsNullOrEmpty(this.CurrUser.LoginProjectId) ? Const.ProjectRealNameBasicDataMenuId : Const.ServerRealNameBasicDataMenuId; var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId); if (buttonList.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index 920ad92d..03ad035c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -89,7 +89,7 @@ namespace FineUIPro.Web.ZHGL.RealName /// private void GetButtonPower() { - string menuId = !string.IsNullOrEmpty(this.CurrUser.LoginProjectId) ? Const.RealNameSynchroSetMenuId : Const.ServerRealNameSynchroSetMenuId; + string menuId = !string.IsNullOrEmpty(this.CurrUser.LoginProjectId) ? Const.ProjectRealNameSynchroSetMenuId : Const.ServerRealNameSynchroSetMenuId; var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId); if (buttonList.Count() > 0) {