|
@@ -132,9 +132,9 @@ class Cloudsum(View):
|
|
|
def equipment_logs(self, userID, request_dict, response):
|
|
|
page = int(request_dict.get('page', None))
|
|
|
line = int(request_dict.get('line', None))
|
|
|
- # order = request_dict.get('order', '-id')
|
|
|
- # if order == '':
|
|
|
- # order = '-id'
|
|
|
+ order = request_dict.get('order', '-id')
|
|
|
+ if order == '':
|
|
|
+ order = '-id'
|
|
|
if not page or not line:
|
|
|
return response.json(444, 'page,line')
|
|
|
|
|
@@ -152,7 +152,7 @@ class Cloudsum(View):
|
|
|
redisObj.del_data(key=logKey)
|
|
|
add_batch_log(data_list)
|
|
|
|
|
|
- qs = EquipmentLogModel.objects.all().order_by('id')
|
|
|
+ qs = EquipmentLogModel.objects.all().order_by(order)
|
|
|
if qs.exists():
|
|
|
count = qs.count()
|
|
|
res = qs[(page - 1) * line:page * line]
|