Commit aa7e2f99 authored by liudong1993's avatar liudong1993

1

parent 1d5d4ecc
...@@ -193,7 +193,7 @@ ORDER BY {orderBy} ...@@ -193,7 +193,7 @@ ORDER BY {orderBy}
{ {
if (demodel.Q_OrderState == 1) if (demodel.Q_OrderState == 1)
{ {
where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} in(1,2)"; where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} in(1,2,4)";
} }
else if (demodel.Q_OrderState == 2) else if (demodel.Q_OrderState == 2)
{ {
......
...@@ -138,6 +138,10 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -138,6 +138,10 @@ namespace Edu.WebApi.Controllers.Customer
{ {
var CustomerId = base.ParmJObj.GetInt("CustomerId"); var CustomerId = base.ParmJObj.GetInt("CustomerId");
var data = customerModule.GetCustomerModule(CustomerId); var data = customerModule.GetCustomerModule(CustomerId);
if (data!=null && data.CreateBy > 0)
{
data.CreateByName = UserReidsCache.GetUserLoginInfo(data.CreateBy)?.AccountName ?? "";
}
return ApiResult.Success(data: data); return ApiResult.Success(data: data);
} }
......
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