From 7d1a05e4875926c551070259173134725890f924 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Wed, 17 Apr 2024 19:35:35 +0800
Subject: [PATCH] chore: release v2.4.3

---
 cmdb-api/api/lib/cmdb/ci_type.py    | 3 +++
 cmdb-api/api/lib/cmdb/preference.py | 5 +++--
 docker-compose.yml                  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmdb-api/api/lib/cmdb/ci_type.py b/cmdb-api/api/lib/cmdb/ci_type.py
index 8284afd..cace664 100644
--- a/cmdb-api/api/lib/cmdb/ci_type.py
+++ b/cmdb-api/api/lib/cmdb/ci_type.py
@@ -1233,7 +1233,10 @@ class CITypeTemplateManager(object):
     def _import_ci_types(self, ci_types, attr_id_map):
         for i in ci_types:
             i.pop("unique_key", None)
+            i.pop("show_name", None)
             i['unique_id'] = attr_id_map.get(i['unique_id'], i['unique_id'])
+            if i.get('show_id'):
+                i['show_id'] = attr_id_map.get(i['show_id'], i['show_id'])
             i['uid'] = current_user.uid
 
         return self.__import(CIType, ci_types)
diff --git a/cmdb-api/api/lib/cmdb/preference.py b/cmdb-api/api/lib/cmdb/preference.py
index a82bc0a..9d0928e 100644
--- a/cmdb-api/api/lib/cmdb/preference.py
+++ b/cmdb-api/api/lib/cmdb/preference.py
@@ -298,8 +298,9 @@ class PreferenceManager(object):
         for type_id in id2type:
             id2type[type_id] = CITypeCache.get(type_id).to_dict()
             id2type[type_id]['unique_name'] = AttributeCache.get(id2type[type_id]['unique_id']).name
-            id2type[type_id]['show_name'] = AttributeCache.get(
-                id2type[type_id]['show_id']).name if id2type[type_id]['show_id'] else None
+            if id2type[type_id]['show_id']:
+                show_attr = AttributeCache.get(id2type[type_id]['show_id'])
+                id2type[type_id]['show_name'] = show_attr and show_attr.name
 
         return result, id2type, sorted(name2id, key=lambda x: x[1])
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e113774..4484478 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
           - redis
 
   cmdb-api:
-    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.2
+    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.3
 #    build:
 #      context: .
 #      target: cmdb-api
@@ -85,7 +85,7 @@ services:
           - cmdb-api
 
   cmdb-ui:
-    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.2
+    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.3
 #    build:
 #      context: .
 #      target: cmdb-ui