ts

Controller/shareUserPermission.py

@@ -10,7 +10,7 @@ from Model.models import Device_User, Device_Info, Role
 from Service.CommonService import CommonService
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-
+from django.db.models import Q
 
 class searchUserView(View):
     @method_decorator(csrf_exempt)
@@ -41,14 +41,14 @@ class searchUserView(View):
                 User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
             elif exact == 'False' or exact == 0:
                 if 'username' in fieldDict.keys():
-                    User = Device_User.objects.filter(username=fieldDict.get('username',
-                                                                             None)).order_by('-data_joined')
+                    username = fieldDict.get('username',None)
+                    User = Device_User.objects.filter(Q(username=username)|Q(phone=username)|Q(userEmail=username)).order_by('-data_joined')
                 elif 'userEmail' in fieldDict.keys():
-                    User = Device_User.objects.filter(userEmail=fieldDict.get('userEmail',
-                                                                              None)).order_by('-data_joined')
+                    email = fieldDict.get('userEmail',None)
+                    User = Device_User.objects.filter(Q(userEmail=email)|Q(username=userEmail)).order_by('-data_joined')
                 elif 'userID' in fieldDict.keys():
-                    User = Device_User.objects.filter(userID=fieldDict.get('userID',
-                                                                           None)).order_by('-data_joined')
+                    userID  = fieldDict.get('userID',None)
+                    User = Device_User.objects.filter(userID=userID).order_by('-data_joined')
                 else:
                     User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
             else:
@@ -318,7 +318,6 @@ class unsharedUserEquipmentView(View):
         GuestID = queryset.get('guestID', None)
         content = queryset.get('content', None)
         unsharedAll = queryset.get('unsharedAll', False)
-
         response = ResponseObject()
 
         if unsharedAll in ('1', '0'):
@@ -342,7 +341,6 @@ class unsharedUserEquipmentView(View):
                         return self.unsharedUserEquipmentSQL(MasterID, GuestID, False, response, args, content=content)
                     else:
                         return response.json(805)
-
             else:
                 return response.json(tko.code)
         else:
@@ -364,10 +362,8 @@ class unsharedUserEquipmentView(View):
                 removeCount = 0
                 errorRemove = []
                 errorUID = []
-
                 contentDict = json.loads(content)
                 uidlist = contentDict.get('UID', None)
-
                 for index in range(len(uidlist)):
                     uid = uidlist[index]
                     try:
@@ -387,17 +383,9 @@ class unsharedUserEquipmentView(View):
                         removeCount += equipmentCount[0]
 
                 if len(errorRemove) > 0:
-                    return response.json(171, {
-                        'removeCount': removeCount,
-                        'error_UID': errorRemove,
-                    })
+                    return response.json(171, {'removeCount': removeCount,'error_UID': errorRemove})
                 else:
                     if len(errorUID) > 0:
-                        return response.json(173, {
-                            'removeCount': removeCount,
-                            'error_UID': errorUID,
-                        })
+                        return response.json(173, {'removeCount': removeCount,'error_UID': errorUID})
                     else:
-                        return response.json(0, {
-                            'removeCount': removeCount
-                        })
+                        return response.json(0, {'removeCount': removeCount})