Merge branch '1.1.3-suhh' into 1.1.3-master

api/controllers/console/datasets/datasets_permissions.py

@@ -52,11 +52,11 @@ class DatasetPermissionListApi(Resource):
             raise NotFound("Dataset not found.")
         if not current_user.is_dataset_editor:
             raise Forbidden()
-        try:
+        #try:
             # 待完善部门领导权限判断
-            DatasetService.check_dataset_permission_new(dataset, current_user)
-        except services.errors.account.NoPermissionError as e:
-            raise Forbidden(str(e))
+        #    DatasetService.check_dataset_permission_new(dataset, current_user)
+       # except services.errors.account.NoPermissionError as e:
+        #    raise Forbidden(str(e))
         # 解析表单数据
         data = request.get_json()
         if not data:

api/services/account_service.py

@@ -116,7 +116,7 @@ class AccountService:
             available_ta = (
                 # TenantAccountJoin.query.filter_by(account_id=account.id).order_by(TenantAccountJoin.id.asc()).first()
                 TenantAccountJoin.query.filter_by(account_id=account.id)
-                .filter_by(role="owner")
+                #.filter_by(role="owner")
                 .order_by(TenantAccountJoin.id.asc())
                 .first()
             )

api/services/feature_service.py

@@ -121,7 +121,7 @@ class FeatureService:
         system_features.enable_social_oauth_login = dify_config.ENABLE_SOCIAL_OAUTH_LOGIN
         system_features.is_allow_register = dify_config.ALLOW_REGISTER
         # system_features.is_allow_create_workspace = dify_config.ALLOW_CREATE_WORKSPACE
-        system_features.is_allow_create_workspace = True
+        system_features.is_allow_create_workspace = False
         system_features.is_email_setup = dify_config.MAIL_TYPE is not None and dify_config.MAIL_TYPE != ""
 
     @classmethod