|
@@ -271,6 +271,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
}
|
|
|
if (IsAct > 0)
|
|
|
{
|
|
|
+ if (IsAct == 2) IsAct = 0;
|
|
|
query = query.Where(m => m.IsAct == IsAct);
|
|
|
}
|
|
|
int TotalCount = query.Count();
|
|
@@ -280,7 +281,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
int ProductUnActCount = ProductCount - ProductActCount;
|
|
|
|
|
|
int IsActNum = query.Count(m => m.IsAct == 1);
|
|
|
- int UnActNum = ProductCount - IsActNum;
|
|
|
+ int UnActNum = query.Count(m => m.IsAct == 0);
|
|
|
if (TradeSort == "1")
|
|
|
{
|
|
|
if (DateSort == "1")
|