Commit 148818e1 authored by 黄奎's avatar 黄奎

页面修改

parent b26c36a4
......@@ -195,10 +195,6 @@ ORDER BY {orderBy}
{
where += $@" and o.{nameof(RB_Order_ViewModel.OrderForm)} ={(int)demodel.OrderForm}";
}
if (demodel.EnterID > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.EnterID)} ={demodel.EnterID}";
}
if (demodel.Dept_Id > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.Dept_Id)} ={demodel.Dept_Id}";
......@@ -275,9 +271,19 @@ ORDER BY {orderBy}
{
where += $@" and o.{nameof(RB_Order_ViewModel.CustomerId)} = {demodel.CustomerId}";
}
//HK 03 - 15修改
if (demodel.CreateBy > 0|| demodel.EnterID > 0)
{
var createBy = 0;
if (demodel.CreateBy > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.CreateBy)} = {demodel.CreateBy}";
createBy = demodel.CreateBy;
}
if (createBy <= 0 && demodel.EnterID > 0)
{
createBy = demodel.EnterID;
}
where += $@" and (o.{nameof(RB_Order_ViewModel.CreateBy)} = {createBy} OR o.{nameof(RB_Order_ViewModel.EnterID)}={createBy} )";
}
if (demodel.CategoryId > 0)
{
......@@ -349,10 +355,7 @@ WHERE {where} ORDER BY {orderBy}
{
where += $@" and o.{nameof(RB_Order_ViewModel.OrderForm)} ={(int)demodel.OrderForm}";
}
if (demodel.EnterID > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.EnterID)} ={demodel.EnterID}";
}
if (demodel.Dept_Id > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.Dept_Id)} ={demodel.Dept_Id}";
......@@ -405,9 +408,19 @@ WHERE {where} ORDER BY {orderBy}
{
where += $@" and o.{nameof(RB_Order_ViewModel.CustomerId)} ={demodel.CustomerId}";
}
//HK 03-15修改
if (demodel.CreateBy > 0 || demodel.EnterID > 0)
{
var createBy = 0;
if (demodel.CreateBy > 0)
{
where += $@" and o.{nameof(RB_Order_ViewModel.CreateBy)} ={demodel.CreateBy}";
createBy = demodel.CreateBy;
}
if (createBy <= 0 && demodel.EnterID > 0)
{
createBy = demodel.EnterID;
}
where += $@" and (o.{nameof(RB_Order_ViewModel.CreateBy)} = {createBy} OR o.{nameof(RB_Order_ViewModel.EnterID)}={createBy} )";
}
if (demodel.CourseSubject > 0)
{
......
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