增加role 那么搜索

Controller/shareUserPermission.py

@@ -40,6 +40,9 @@ class searchUserView(View):
         elif 'userID' in fieldDict.keys():
             userID = fieldDict.get('userID', None)
             User = Device_User.objects.filter(userID=userID).order_by('-data_joined')
+        elif 'roleName' in fieldDict.keys():
+            roleName = fieldDict.get('roleName', None)
+            User = Device_User.objects.filter(role__roleName__contains=roleName).order_by('-data_joined')
         else:
             User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
         if User.exists():
@@ -242,13 +245,13 @@ class shareUserEquipmentView(View):
                 return response.json(500, {"details": repr(e)})
             else:
                 if dictLen > 0:
-                    res = {'Shared': dictLen,'Sharing': len(querysetList),'errormsg': 'some had share'}
+                    res = {'Shared': dictLen, 'Sharing': len(querysetList), 'errormsg': 'some had share'}
                 else:
                     if sharedAll:
                         res = {'Sharing': len(querysetList)}
                     else:
                         if len(UID) > 0:
-                            res = {'error_UID': UID,'Sharing': len(querysetList)}
+                            res = {'error_UID': UID, 'Sharing': len(querysetList)}
                         else:
                             res = {'Sharing': len(querysetList)}
                 return response.json(0, res)
@@ -297,7 +300,7 @@ class unsharedUserEquipmentView(View):
                     if content != None and MasterID != None:
                         return self.unsharedUserEquipmentSQL(MasterID, GuestID, False, response, args, content=content)
                     else:
-                        return response.json(444,'content or unsharedAll')
+                        return response.json(444, 'content or unsharedAll')
             else:
                 return response.json(tko.code)
         else:
@@ -339,4 +342,3 @@ class unsharedUserEquipmentView(View):
                         return response.json(173, {'removeCount': removeCount, 'error_UID': errorUID})
                     else:
                         return response.json(0, {'removeCount': removeCount})
-