查询空数组结果修改

app/controller/order.py

@@ -33,9 +33,6 @@ class TopUpOrder(Resource):
         args['user_id'] = request.user_id
         data = order_service.TopUpOrderService().get_order(args)
         resp = request.return_success
-        if not data.get('content', None):
-            resp['attributes'] = []
-        else:
         resp['attributes'] = data
         return resp
 
@@ -79,9 +76,6 @@ class ConsumeOrder(Resource):
         args['user_id'] = request.user_id
         data = order_service.CurriculumOrderService().get_order(args)
         resp = request.return_success
-        if not data.get('content', None):
-            resp['attributes'] = []
-        else:
         resp['attributes'] = data
         return resp
 
@@ -215,9 +209,6 @@ class AllOrders(Resource):
         args['user_id'] = request.user_id
         data = order_service.getAllOrders(args)
         resp = request.return_success
-        if not data.get('content', None):
-            resp['attributes'] = []
-        else:
         resp['attributes'] = data
         return resp
 

app/service/order_service.py

@@ -48,6 +48,8 @@ class TopUpOrderService:
             keys = set(r.keys()) - allowed
             for key in keys:
                 del r[key]
+        if not res:
+            res = []
         return {
             'content': res,
             'pageNum': pageNumber,
@@ -157,6 +159,8 @@ class CurriculumOrderService:
             keys = set(r.keys()) - allowed
             for key in keys:
                 del r[key]
+        if not temp_orders:
+            temp_orders = []
         return {
             'content': temp_orders,
             'pageNum': pageNumber,
@@ -391,6 +395,8 @@ def getAllOrders(args):
             keys = set(r.keys()) - allowed
             for key in keys:
                 del r[key]
+        if not temp_orders:
+            temp_orders = []
         return {
             'content': temp_orders,
             'pageNum': pageNumber,