Commit 457ebe8a authored by 吴春's avatar 吴春

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 6163ad93 1ab733be
This diff is collapsed.
...@@ -195,7 +195,7 @@ ORDER BY {orderBy} ...@@ -195,7 +195,7 @@ ORDER BY {orderBy}
} }
if (!string.IsNullOrEmpty(demodel.ClassNo)) if (!string.IsNullOrEmpty(demodel.ClassNo))
{ {
where += $@" and c.{nameof(RB_Class.ClassNo)} ={demodel.ClassNo}"; where += $@" and c.{nameof(RB_Class.ClassNo)} ='{demodel.ClassNo}'";
} }
if (!string.IsNullOrEmpty(demodel.GuestName)) if (!string.IsNullOrEmpty(demodel.GuestName))
{ {
...@@ -310,6 +310,10 @@ where {where} order by {orderBy} ...@@ -310,6 +310,10 @@ where {where} order by {orderBy}
{ {
where += $@" and c.{nameof(RB_Class.ClassName)} like '%{demodel.ClassName}%'"; where += $@" and c.{nameof(RB_Class.ClassName)} like '%{demodel.ClassName}%'";
} }
if (!string.IsNullOrEmpty(demodel.ClassNo))
{
where += $@" and c.{nameof(RB_Class.ClassNo)} ='{demodel.ClassNo}'";
}
if (!string.IsNullOrEmpty(demodel.GuestName)) if (!string.IsNullOrEmpty(demodel.GuestName))
{ {
if (demodel.Group_Id > 0) if (demodel.Group_Id > 0)
......
...@@ -1310,7 +1310,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1310,7 +1310,8 @@ namespace Edu.WebApi.Controllers.Course
Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"), Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"), PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
EnterID = base.ParmJObj.GetInt("EnterID"), EnterID = base.ParmJObj.GetInt("EnterID"),
HelpEnterId = base.ParmJObj.GetInt("HelpEnterId",0) HelpEnterId = base.ParmJObj.GetInt("HelpEnterId",0),
ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
}; };
demodel.Group_Id = userInfo.Group_Id; demodel.Group_Id = userInfo.Group_Id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment