培训

2025-02-25 16:46:09 +08:00
parent 9a1dae2f31
commit 1c5146a776
40 changed files with 1 additions and 280 deletions
@@ -4,10 +4,6 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
-<<<<<<< HEAD
-using System.Xml.Linq;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;

@@ -103,11 +99,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
            }
            if (this.drpRole.SelectedValue != BLL.Const._Null)
            {
-<<<<<<< HEAD
-                strSql += " AND Course.RoleId = @RoleId";
-=======
                strSql += " AND Standard.RoleId = @RoleId";
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue));
            }
            if (this.drpCategory.SelectedValue != BLL.Const._Null)