Merge pull request #2251 from TencentBlueKing/develop

fix: update group application custom content (#2250)
TencentBlueKing · Sep 5, 2023 · 768494e · 768494e
2 parents 8109dfc + 1db41c1
commit 768494e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/saas/backend/api/management/v2/serializers.py b/saas/backend/api/management/v2/serializers.py
@@ -225,7 +225,9 @@ def validate(self, data):
                 raise serializers.ValidationError({"content_template": ["content_template中必须包含schemes和form_data"]})
             if (
                 not isinstance(data["content_template"]["form_data"], list)
-                or len(data["content_template"]["form_data"]) != 0
+                or len(data["content_template"]["form_data"]) != 1
+                or "value" not in data["content_template"]["form_data"][0]
+                or not isinstance(data["content_template"]["form_data"][0]["value"], list)
             ):
                 raise serializers.ValidationError({"content_template": ["content_template中必须包含form_data且为空数组"]})
 

diff --git a/saas/backend/biz/application.py b/saas/backend/biz/application.py
@@ -10,6 +10,7 @@
 """
 import logging
 from collections import defaultdict
+from copy import deepcopy
 from itertools import groupby
 from typing import Any, Dict, List, Optional, Tuple, Type
 
@@ -709,10 +710,8 @@ def create_for_group(
             # 组装外部传入的itsm单据数据
             content: Optional[Dict[str, Any]] = None
             if content_template and group_content:
-                content = {
-                    "schemes": content_template["schemes"],
-                    "form_data": [group_content[str(_id)] for _id in group_ids],
-                }
+                content = deepcopy(content_template)
+                content["form_data"][0]["value"] = [group_content[str(_id)] for _id in group_ids]
 
             new_data_list.append((application_data, process, content))