diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx.cs index 69850ca9..a3ef2d95 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/ManagerMonthC.aspx.cs @@ -760,7 +760,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { return; } - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.WeekReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CQMonthReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnAdd)) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx index 0c6514b9..a7f65b42 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx @@ -34,8 +34,8 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs index ec6c3660..5d6ee39c 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs @@ -78,7 +78,7 @@ namespace FineUIPro.Web.HSSE.EduTrain List listStr = new List(); if (!string.IsNullOrEmpty(this.txtName.Text.Trim())) { - strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name)"; + strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name OR Unit.UnitName like @name)"; listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%")); } if (!string.IsNullOrEmpty(this.txtMinScores.Text.Trim()))