合并最新

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
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_DetectionTypeMenuId, Const.BtnAdd))
if (GetButtonPower( Const.BtnAdd))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TestingEdit.aspx", "新增 - ")));
}
@@ -306,7 +306,12 @@ namespace FineUIPro.Web.HJGL.BaseInfo
/// <returns></returns>
private bool GetButtonPower(string button)
{
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_DetectionTypeMenuId, button);
string menuId = Const.HJGL_DetectionTypeMenuId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
menuId = Const.PHJGL_DetectionTypeMenuId;
}
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId, button);
}
#endregion
}