fix(backend): 支持变更SQL单据的非审批配置 TencentBlueKing#5072

yyhenryyy · Jun 20, 2024 · 903bb5c · 903bb5c
1 parent 091dd9c
commit 903bb5c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/dbm-ui/backend/db_services/dbpermission/db_account/handlers.py b/dbm-ui/backend/db_services/dbpermission/db_account/handlers.py
@@ -168,7 +168,7 @@ def list_account_rules(self, rule_filter: AccountRuleMeta) -> Dict:
         # 如果是通过id过滤的，则不管集群类型
         if rule_filter.rule_ids:
             rules_list = DBPrivManagerApi.list_account_rules(
-                {"bk_biz_id": self.bk_biz_id, "ids": rule_filter.rule_ids}
+                {"bk_biz_id": self.bk_biz_id, "cluster_type": self.account_type, "ids": rule_filter.rule_ids}
             )
         else:
             rules_list = DBPrivManagerApi.list_account_rules(

diff --git a/dbm-ui/backend/ticket/builders/mysql/mysql_import_sqlfile.py b/dbm-ui/backend/ticket/builders/mysql/mysql_import_sqlfile.py
@@ -178,14 +178,18 @@ def init_ticket_flows(self):
                 details=MysqlSqlImportFlowParamBuilder(self.ticket).get_params(),
                 flow_alias=_("SQL模拟执行状态查询"),
             ),
-            Flow(
-                ticket=self.ticket,
-                flow_type=FlowType.BK_ITSM.value,
-                details=MysqlSqlImportItsmParamBuilder(self.ticket).get_params(),
-                flow_alias=_("单据审批"),
-            ),
         ]
 
+        if self.need_itsm:
+            flows.append(
+                Flow(
+                    ticket=self.ticket,
+                    flow_type=FlowType.BK_ITSM.value,
+                    details=MysqlSqlImportItsmParamBuilder(self.ticket).get_params(),
+                    flow_alias=_("单据审批"),
+                )
+            )
+
         mode = self.ticket.details["ticket_mode"]["mode"]
         if mode == SQLExecuteTicketMode.MANUAL.value:
             flows.append(Flow(ticket=self.ticket, flow_type=FlowType.PAUSE.value, flow_alias=_("人工确认执行")))

diff --git a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_import_sqlfile.py b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_import_sqlfile.py
@@ -92,14 +92,18 @@ def init_ticket_flows(self):
                 details=TenDBClusterSqlImportFlowParamBuilder(self.ticket).get_params(),
                 flow_alias=_("模拟执行"),
             ),
-            Flow(
-                ticket=self.ticket,
-                flow_type=FlowType.BK_ITSM.value,
-                details=TenDBClusterSqlImportItsmParamBuilder(self.ticket).get_params(),
-                flow_alias=_("单据审批"),
-            ),
         ]
 
+        if self.need_itsm:
+            flows.append(
+                Flow(
+                    ticket=self.ticket,
+                    flow_type=FlowType.BK_ITSM.value,
+                    details=TenDBClusterSqlImportItsmParamBuilder(self.ticket).get_params(),
+                    flow_alias=_("单据审批"),
+                )
+            )
+
         mode = self.ticket.details["ticket_mode"]["mode"]
         if mode == SQLExecuteTicketMode.MANUAL.value:
             flows.append(Flow(ticket=self.ticket, flow_type=FlowType.PAUSE.value, flow_alias=_("人工确认执行")))