fix: Common user folder permission

Author: zhanweizhang7

apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py

@@ -25,15 +25,15 @@ def get_first_non_null(self, variable_list):
             v = self.workflow_manage.get_reference_field(
                 variable.get('variable')[0],
                 variable.get('variable')[1:])
-            if v is not None and not(isinstance(v, (str,list,dict)) and len(v) == 0) :
+            if v is not None and not (isinstance(v, (str, list, dict)) and len(v) == 0):
                 return v
         return None
 
     def set_variable_to_json(self, variable_list):
 
-        return {variable.get('variable')[1:][0]: self.workflow_manage.get_reference_field(
+        return [self.workflow_manage.get_reference_field(
             variable.get('variable')[0],
-            variable.get('variable')[1:]) for variable in variable_list}
+            variable.get('variable')[1:]) for variable in variable_list]
 
     def reset_variable(self, variable):
         value = self.workflow_manage.get_reference_field(

apps/folders/views/folder.py

@@ -45,7 +45,7 @@ class FolderView(APIView):
                                      ),
         lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
                                          [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"),
-                                                     operate=Operate.SELF,
+                                                     operate=Operate.EDIT,
                                                      resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{r.data.get('parent_id')}"
                                                      )], CompareConstants.AND),
         RoleConstants.WORKSPACE_MANAGE.get_workspace_role()
@@ -107,7 +107,7 @@ class Operate(APIView):
                                          ),
             lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
                                              [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"),
-                                                         operate=Operate.SELF,
+                                                         operate=Operate.EDIT,
                                                          resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}"
                                                          )], CompareConstants.AND),
             RoleConstants.WORKSPACE_MANAGE.get_workspace_role()
@@ -159,7 +159,7 @@ def get(self, request: Request, workspace_id: str, source: str, folder_id: str):
                                          ),
             lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
                                              [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"),
-                                                         operate=Operate.SELF,
+                                                         operate=Operate.EDIT,
                                                          resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}"
                                                          )], CompareConstants.AND),
             RoleConstants.WORKSPACE_MANAGE.get_workspace_role()