|
@@ -41,17 +41,25 @@ namespace MySystem
|
|
|
if(item.Kind == 1)
|
|
|
{
|
|
|
var merchant = new MerchantAddInfoService().Query(item.MerchantId);
|
|
|
- row.Add("MerchantId", merchant.Id);
|
|
|
- row.Add("MerchantName", merchant.CertMerchantName);
|
|
|
+ if(merchant.Status == 2 || merchant.QueryCount == 2)
|
|
|
+ {
|
|
|
+ row.Add("MerchantId", merchant.Id);
|
|
|
+ row.Add("MerchantName", merchant.CertMerchantName);
|
|
|
+ row.Add("Kind", item.Kind);
|
|
|
+ diclist.Add(row);
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
var merchant = new MerchantAddInfo2Service().Query(item.MerchantId);
|
|
|
- row.Add("MerchantId", merchant.Id);
|
|
|
- row.Add("MerchantName", merchant.CertMerchantName);
|
|
|
+ if(merchant.Status == 2 || merchant.QueryCount == 2)
|
|
|
+ {
|
|
|
+ row.Add("MerchantId", merchant.Id);
|
|
|
+ row.Add("MerchantName", merchant.CertMerchantName);
|
|
|
+ row.Add("Kind", item.Kind);
|
|
|
+ diclist.Add(row);
|
|
|
+ }
|
|
|
}
|
|
|
- row.Add("Kind", item.Kind);
|
|
|
- diclist.Add(row);
|
|
|
}
|
|
|
db.Dispose();
|
|
|
return diclist;
|