fix: Resource authorization

apps/system_manage/api/user_resource_permission.py

@@ -297,7 +297,7 @@ class ResourceUserPermissionPageAPI(APIMixin):
                 required=False
             ),
             OpenApiParameter(
-                name="permission",
+                name="permission[]",
                 description="权限",
                 type=OpenApiTypes.STR,
                 location='query',

apps/system_manage/serializers/user_resource_permission.py

@@ -326,7 +326,8 @@ class ResourceUserPermissionSerializer(serializers.Serializer):
         user_query_set = QuerySet(model=get_dynamics_model({
             'nick_name': models.CharField(),
             'username': models.CharField(),
-            "permission": models.CharField()
+            "permission": models.CharField(),
+            "id": models.UUIDField(),
         }))
         nick_name = instance.get('nick_name')
         username = instance.get('username')
@@ -352,6 +353,11 @@ class ResourceUserPermissionSerializer(serializers.Serializer):
                 else:
                     user_query_set = user_query_set.filter(
                         permission__in=query_p_list)
+        workspace_user_role_mapping_model = DatabaseModelManage.get_model("workspace_user_role_mapping")
+        if workspace_user_role_mapping_model:
+            user_query_set=user_query_set.filter(
+                id__in=QuerySet(workspace_user_role_mapping_model).filter(
+                    workspace_id=self.data.get('workspace_id')).values("user_id"))
 
         return {
             'workspace_user_resource_permission_query_set': workspace_user_resource_permission_query_set,

apps/system_manage/views/user_resource_permission.py

@@ -197,5 +197,5 @@ class WorkspaceResourceUserPermissionView(APIView):
                 data={'workspace_id': workspace_id, "target": target, 'auth_target_type': resource, }
             ).page({'username': request.query_params.get("username"),
                     'nick_name': request.query_params.get("nick_name"),
-                    'permission': request.query_params.getlist("permission")}, current_page, page_size,
+                    'permission': request.query_params.getlist("permission[]")}, current_page, page_size,
                    ))