|
@@ -69,7 +69,7 @@ namespace MySystem
|
|
|
int skip = (pageNum - 1) * pageSize;
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
List<int> newlist = new List<int>();
|
|
|
- var mysqllist = db.PosMachines.Select(m => new { m.Id, m.BindMerchantId }).Where(m => m.BindMerchantId == MerchantId).OrderByDescending(m => m.Id).Skip(skip).Take(pageSize).ToList();
|
|
|
+ var mysqllist = db.PosMachines.Select(m => new { m.Id, m.BindMerchantId, m.DeviceKind }).Where(m => m.BindMerchantId == MerchantId && m.DeviceKind == "2").OrderByDescending(m => m.Id).Skip(skip).Take(pageSize).ToList();
|
|
|
if (mysqllist.Count > 0)
|
|
|
{
|
|
|
foreach (var sub in mysqllist)
|