fix: fix empty approver (#2491)

TencentBlueKing · Jan 22, 2024 · f4eb10c · f4eb10c
1 parent 3407a9e
commit f4eb10c
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/saas/backend/biz/application_process.py b/saas/backend/biz/application_process.py
@@ -112,6 +112,13 @@ def _split_policy_process_by_resource_approver_dict(
         """
         通过实例审批人信息, 分离policy_process为独立的实例policy
         """
+        # 填充系统管理员, 默认为系统管理管理员
+        if self.system_manager_approver:
+            policy_process.process.set_node_approver(
+                ProcessorNodeType.INSTANCE_APPROVER.value,
+                self.system_manager_approver,
+            )
+
         if len(policy_process.policy.list_thin_resource_type()) != 1:
             return [policy_process]
 
@@ -136,7 +143,12 @@ def _split_policy_process_by_resource_approver_dict(
                             last_node = path[-2]
 
                         resource_node = ResourceNodeBean.parse_obj(last_node)
-                        if not resource_approver_dict.get_attribute(resource_node):
+                        instance_approver = resource_approver_dict.get_attribute(resource_node)
+                        # NOTE: 去除接入系统可能传入错误的审批人
+                        if isinstance(instance_approver, list):
+                            instance_approver = [item for item in instance_approver if item]
+
+                        if not instance_approver:
                             continue
 
                         # 复制出单实例的policy
@@ -146,7 +158,7 @@ def _split_policy_process_by_resource_approver_dict(
                         copied_process = deepcopy(process)
                         copied_process.set_node_approver(
                             ProcessorNodeType.INSTANCE_APPROVER.value,
-                            resource_approver_dict.get_attribute(resource_node),
+                            instance_approver,
                         )
 
                         policy_process_list.append(PolicyProcess(policy=copied_policy, process=copied_process))
@@ -186,6 +198,10 @@ def _list_approver_resource_node_by_policy(self, policy: PolicyBean) -> List[Res
                 resource_node_set.add(ResourceNodeBean.parse_obj(last_node))
         return list(resource_node_set)
 
+    @cached_property
+    def system_manager_approver(self) -> List[str]:
+        return Role.objects.get(type=RoleType.SYSTEM_MANAGER.value, code=self.system_id).members
+
 
 class InstanceApproverMergeHandler(InstanceApproverHandler):
     """
@@ -237,7 +253,10 @@ def _split_policy_process_by_resource_approver_dict(
                             last_node = path[-2]
 
                         resource_node = ResourceNodeBean.parse_obj(last_node)
-                        if not resource_approver_dict.get_attribute(resource_node):
+                        if (
+                            not resource_approver_dict.get_attribute(resource_node)
+                            or not resource_approver_dict.get_attribute(resource_node)[0]
+                        ):
                             continue
 
                         # 由于ITSM的限制, 合并审批这里只取每个实例的第一个审批人
@@ -269,10 +288,6 @@ def _split_policy_process_by_resource_approver_dict(
         policy_process_list.append(policy_process)
         return policy_process_list
 
-    @cached_property
-    def system_manager_approver(self) -> List[str]:
-        return Role.objects.get(type=RoleType.SYSTEM_MANAGER.value, code=self.system_id).members
-
 
 def copy_policy_by_instance_path(policy, resource_group, rrt, instance, path):
     # 复制出单实例的policy