Merge pull request TencentBlueKing#1199 from hanshuaikang/feature/dev…

…elop_by_han bugfix: 修复部分条件下无value的情况，此时优先取label
luofann · Sep 12, 2023 · dbd49ed · dbd49ed
2 parents e3803dc + 38713c2
commit dbd49ed
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/itsm/ticket/models/ticket.py b/itsm/ticket/models/ticket.py
@@ -4053,11 +4053,14 @@ def display_content(field_type, content):
                     single = []
                     for attr_name, attr_value in attr.items():
                         try:
-                            if isinstance(attr_value["value"], str):
+                            attr_display = (
+                                attr_value.get("label") or attr_value["value"]
+                            )
+                            if isinstance(attr_display, str):
                                 single.append(
                                     "{}:{}".format(
                                         schemes_map[scheme][attr_name],
-                                        attr_value.get("label") or attr_value["value"],
+                                        attr_display,
                                     )
                                 )
                         except Exception as err: