合并最新

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
@@ -275,13 +275,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo
/// <returns></returns>
private bool GetButtonPower(string button)
{
//string menuId = Const.HJGL_ConsumablesMenuId;
//if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// menuId = Const.PHJGL_ConsumablesMenuId;
//}
string menuId = Const.HJGL_PipingClassMenuId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
menuId = Const.PHJGL_PipingClassMenuId;
}
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_PipingClassMenuId, button);
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId, button);
}
#endregion