fix: Cannot set original org when exception occurs

apps/orgs/utils.py

@@ -97,8 +97,10 @@ def get_current_org_id_for_serializer():
 @contextmanager
 def tmp_to_root_org():
     ori_org = get_current_org()
+    try:
         set_to_root_org()
         yield
+    finally:
         if ori_org is not None:
             set_current_org(ori_org)
 
@@ -106,9 +108,11 @@ def tmp_to_root_org():
 @contextmanager
 def tmp_to_org(org):
     ori_org = get_current_org()
+    try:
         if org:
             set_current_org(org)
         yield
+    finally:
         if ori_org is not None:
             set_current_org(ori_org)
 
@@ -122,9 +126,10 @@ def tmp_to_builtin_org(system=0, default=0):
     else:
         raise ValueError("Must set system or default")
     ori_org = get_current_org()
+    try:
         set_current_org(org_id)
         yield
-    if ori_org is not None:
+    finally:
         set_current_org(ori_org)