获取角色数据区分是否作为选项

AdminController/MenuController.py

@@ -61,7 +61,7 @@ class MenuView(View):
 
     def getList(self, userID, request_dict, response):
         role_qs = Role.objects.filter(device_user=userID)
-        menu_qs = MenuModel.objects.filter(parentId=0);
+        menu_qs = MenuModel.objects.filter(parentId=0)
         list = []
         i = 0
         for menu in menu_qs:

AdminController/RoleController.py

@@ -64,6 +64,11 @@ class RoleView(View):
                 return response.json(404)
 
     def getList(self, userID, request_dict, response):
+        isSelect = request_dict.get('isSelect', None)   # 获取全部数据作为角色选项
+        if isSelect:
+            role_qs = Role.objects.all().values('rid', 'roleName', 'Description')
+            return response.json(0, {'list': CommonService.qs_to_list(role_qs)})
+
         roleName = request_dict.get('roleName', '').strip()  # 移除字符串头尾的空格
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
@@ -73,9 +78,9 @@ class RoleView(View):
         page = int(pageNo)
         line = int(pageSize)
         if roleName:
-            role_qs = Role.objects.filter(roleName=roleName).values('rid', 'roleName', 'Description');
+            role_qs = Role.objects.filter(roleName=roleName).values('rid', 'roleName', 'Description')
         else:
-            role_qs = Role.objects.all().values('rid', 'roleName', 'Description');
+            role_qs = Role.objects.all().values('rid', 'roleName', 'Description')
 
         count = role_qs.count()
         role_qs = role_qs.order_by('rid')[(page - 1) * line:page * line]