Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/UidSetController.py

@@ -95,16 +95,17 @@ class UidSetView(View):
             return response.json(0)
 
     def do_admin_queryAll(self, request_dict, userID, response):
-        uid_list = Device_Info.objects.filter(userID_id=userID).values_list('UID', flat=True)
-        id = request_dict.get('id', None)
-        uid_set_qs = UidPushModel.objects.filter(uid_set__id=id).values('addTime',
-                                                                        'appBundleId','app_type','lang','m_code','push_type','token_val','tz','uid_set',
-                                                                        'updTime','userID','userID__username'
-                                                                        , 'userID__userEmail', 'userID__NickName'
-                                                                        , 'userID__is_active', 'userID__phone'
-                                                                        )
-
-        return response.json(0, list(uid_set_qs))
+        uid = request_dict.get('uid', None)
+        user_search = UidPushModel.objects.filter(uid_set__uid=uid).values(
+            'userID__username', 'userID__userEmail', 'userID__phone', 'userID__is_active',
+            'userID__NickName', 'uid_set__video_code', 'uid_set__version', 'uid_set__ucode',
+            'uid_set__tz', 'uid_set__p2p_region', 'uid_set__nickname', 'uid_set__detect_status',
+            'uid_set__detect_interval', 'uid_set__cloud_vod', 'uid_set__channel', 'updTime',
+            'tz', 'token_val', 'push_type', 'm_code',
+            'lang', 'app_type', 'uid_set__uid', 'userID__data_joined', 'appBundleId'
+        )
+        qs_list = CommonService.qs_to_list(user_search)
+        return response.json(0, qs_list)
 
     # 管理员删除
     def do_admin_delete(self, request_dict, userID, response):

Service/CommonService.py

@@ -187,6 +187,11 @@ class CommonService:
                         ps['data_joined'] = ps['data_joined'].strftime("%Y-%m-%d %H:%M:%S")
                     else:
                         ps['data_joined'] = ''
+                if 'userID__data_joined' in ps:
+                    if ps['userID__data_joined']:
+                        ps['userID__data_joined'] = ps['userID__data_joined'].strftime("%Y-%m-%d %H:%M:%S")
+                    else:
+                        ps['userID__data_joined'] = ''
             except Exception as e:
                 pass
             res.append(ps)