|
@@ -414,7 +414,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
|
int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
- IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId);
|
|
|
+ IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Sort == 1);
|
|
|
if (Status > 0)
|
|
|
{
|
|
|
if (Status == 1) Status = 0;
|
|
@@ -546,7 +546,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
|
int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
- List<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.QueryCount == 1).ToList();
|
|
|
+ List<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Sort == 0).ToList();
|
|
|
foreach (var subdata in query)
|
|
|
{
|
|
|
Dictionary<string, object> curData = new Dictionary<string, object>();
|