1

2025-02-22 10:34:16 +08:00
parent 0c6a49306c 7396d1b654
commit 379ff372c5
63 changed files with 4416 additions and 3 deletions
@@ -4,7 +4,10 @@ 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;

@@ -100,7 +103,11 @@ 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)