fix: fix default instance approver (#2497)

TencentBlueKing · Jan 23, 2024 · bc8c716 · bc8c716
1 parent 73dcdfb
commit bc8c716
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/saas/backend/biz/application_process.py b/saas/backend/biz/application_process.py
@@ -80,6 +80,9 @@ def handle(self, policy_process_list: List[PolicyProcess]) -> List[PolicyProcess
                 policy_process_results.append(policy_process)
                 continue
 
+            # 设置默认的审批人
+            self.set_default_approver(policy_process.process)
+
             # 保存需要处理实例审批人的policy_process
             policy_process_with_approver_node.append(policy_process)
             # 筛选出需要查询实例审批人的资源实例
@@ -106,19 +109,20 @@ def handle(self, policy_process_list: List[PolicyProcess]) -> List[PolicyProcess
     def has_instance_approver_node(self, process: ApprovalProcessWithNodeProcessor) -> bool:
         return process.has_instance_approver_node()
 
-    def _split_policy_process_by_resource_approver_dict(
-        self, policy_process: PolicyProcess, resource_approver_dict: ResourceNodeAttributeDictBean
-    ) -> List[PolicyProcess]:
-        """
-        通过实例审批人信息, 分离policy_process为独立的实例policy
-        """
+    def set_default_approver(self, process: ApprovalProcessWithNodeProcessor):
         # 填充系统管理员, 默认为系统管理管理员
         if self.system_manager_approver:
-            policy_process.process.set_node_approver(
+            process.set_node_approver(
                 ProcessorNodeType.INSTANCE_APPROVER.value,
                 self.system_manager_approver,
             )
 
+    def _split_policy_process_by_resource_approver_dict(
+        self, policy_process: PolicyProcess, resource_approver_dict: ResourceNodeAttributeDictBean
+    ) -> List[PolicyProcess]:
+        """
+        通过实例审批人信息, 分离policy_process为独立的实例policy
+        """
         if len(policy_process.policy.list_thin_resource_type()) != 1:
             return [policy_process]
 
@@ -211,19 +215,20 @@ class InstanceApproverMergeHandler(InstanceApproverHandler):
     def has_instance_approver_node(self, process: ApprovalProcessWithNodeProcessor) -> bool:
         return process.has_instance_approver_merge_node()
 
-    def _split_policy_process_by_resource_approver_dict(
-        self, policy_process: PolicyProcess, resource_approver_dict: ResourceNodeAttributeDictBean
-    ) -> List[PolicyProcess]:
-        """
-        通过实例审批人信息, 分离policy_process为独立的实例policy
-        """
+    def set_default_approver(self, process: ApprovalProcessWithNodeProcessor):
         # 填充系统管理员, 默认为系统管理管理员
         if self.system_manager_approver:
-            policy_process.process.set_node_approver(
+            process.set_node_approver(
                 ProcessorNodeType.INSTANCE_APPROVER_MERGE.value,
                 [self.system_manager_approver[0]],
             )
 
+    def _split_policy_process_by_resource_approver_dict(
+        self, policy_process: PolicyProcess, resource_approver_dict: ResourceNodeAttributeDictBean
+    ) -> List[PolicyProcess]:
+        """
+        通过实例审批人信息, 分离policy_process为独立的实例policy
+        """
         if len(policy_process.policy.list_thin_resource_type()) != 1:
             return [policy_process]