修改搜索查询接口

Controller/UidUser.py

@@ -325,23 +325,31 @@ class UidUserView(View):
                     return response.json(10, repr(e))
                 else:
                     kwargs = CommonService.get_kwargs(data=searchCondition)
-                    omqs = UidUserModel.objects.filter(**kwargs).order_by('-id')
-                    if not omqs.exists():
+                    uid_user_qs = UidUserModel.objects.filter(**kwargs).order_by('-id')
+                    if not uid_user_qs.exists():
                         return response.json(0, [])
-                    count = omqs.count()
-                    order_ql = omqs[(page - 1) * line:page * line]
-                    uidset_json = CommonService.qs_to_dict(order_ql)
-                    uidset_json['count'] = count
-                    return response.json(0, uidset_json)
+                    count = uid_user_qs.count()
+                    uid_user_ql = uid_user_qs[(page - 1) * line:page * line]. \
+                        values('id', 'userID', 'userID__username', 'userID__userEmail', 'userID__NickName' 'NickName',
+                               'UID', 'View_Account',
+                               'View_Password', 'ChannelIndex', 'Type', 'isShare',
+                               'primaryUserID', 'primaryMaster', 'data_joined', 'version',
+                               'isVod', 'isExist', 'NotificationMode', 'is_ap')
+                    uid_user_ls = CommonService.qs_to_list(uid_user_ql)
+                    return response.json(0, {'datas': uid_user_ls, 'count': count})
             else:
-                omqs = UidUserModel.objects.all().order_by('-id')
-                if not omqs.exists():
+                uid_user_qs = UidUserModel.objects.all().order_by('-id')
+                if not uid_user_qs.exists():
                     return response.json(0, [])
-                count = omqs.count()
-                order_ql = omqs[(page - 1) * line:page * line]
-                uidset_json = CommonService.qs_to_dict(order_ql)
-                uidset_json['count'] = count
-                return response.json(0, uidset_json)
+                count = uid_user_qs.count()
+                uid_user_ql = uid_user_qs[(page - 1) * line:page * line]. \
+                    values('id', 'userID', 'userID__username', 'userID__userEmail', 'userID__NickName', 'NickName',
+                           'UID', 'View_Account',
+                           'View_Password', 'ChannelIndex', 'Type', 'isShare',
+                           'primaryUserID', 'primaryMaster', 'data_joined', 'version',
+                           'isVod', 'isExist', 'NotificationMode', 'is_ap')
+                uid_user_ls = CommonService.qs_to_list(uid_user_ql)
+                return response.json(0, {'datas' : uid_user_ls, 'count': count})
         else:
             return response.json(404)