|
@@ -146,7 +146,7 @@ class Device(object):
|
|
|
search['id--ins'] = tuple(eval(search['id--ins']))
|
|
|
#order='inorder asc, type_id asc,udate asc,id asc'
|
|
|
#inorder asc, type_id asc,udate asc,hardware_id asc
|
|
|
- return self.service('common').list('device_info', state=True, search=search, order='cdate desc,udate asc,hardware_id asc', limit='0,10000')
|
|
|
+ return self.service('common').list('device_info', state=True, search=search, order='inorder asc, type_id asc, udate asc,hardware_id asc,cdate desc', limit='0,10000')
|
|
|
|
|
|
@staticmethod
|
|
|
def getByGateway(self, search={}):
|