dever 4 years ago
parent
commit
161097fc07
2 changed files with 2 additions and 2 deletions
  1. 1 1
      admin/page/device.py
  2. 1 1
      front/page/__load__.py

+ 1 - 1
admin/page/device.py

@@ -117,7 +117,7 @@ class info_path(Load):
 			self.data['search']['status'] = False
 
 		#inorder asc, type_id asc,
-		self.list('device_info', order='cdate desc, udate asc,hardware_id asc')
+		self.list('device_info', order='inorder asc, type_id asc, udate asc,hardware_id asc,cdate desc')
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
 				farm = self.service('common').one('farm', id=value['farm_id'])

+ 1 - 1
front/page/__load__.py

@@ -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={}):