|
@@ -39,6 +39,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
|
|
|
int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
|
|
int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
|
|
|
int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
|
|
int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
|
|
|
string condition = "";
|
|
string condition = "";
|
|
|
|
|
+ if (!string.IsNullOrEmpty(data["MerchantId"].ToString()))
|
|
|
|
|
+ {
|
|
|
|
|
+ condition += " and MerchantId='" + MerchantId + "'";
|
|
|
|
|
+ }
|
|
|
List<RelationData> relationData = new List<RelationData>();
|
|
List<RelationData> relationData = new List<RelationData>();
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
List<Dictionary<string, object>> source = MerchantParamSetRecordService.List(relationData, condition, pageNum, pageSize);
|
|
List<Dictionary<string, object>> source = MerchantParamSetRecordService.List(relationData, condition, pageNum, pageSize);
|