From 6e02f6a21f188d46d5cfc9c75baa9f43475b20f2 Mon Sep 17 00:00:00 2001 From: pycook Date: Mon, 26 Aug 2024 13:29:03 +0800 Subject: [PATCH] fix(api): in query --- cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py | 2 +- cmdb-api/api/lib/cmdb/value.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py b/cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py index f3e76bf..df61745 100644 --- a/cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py +++ b/cmdb-api/api/lib/cmdb/search/ci/db/query_sql.py @@ -56,7 +56,7 @@ QUERY_CI_BY_ATTR_NAME = """ SELECT {0}.ci_id FROM {0} WHERE {0}.attr_id={1:d} - AND {0}.value {2} + AND ({0}.value {2}) """ QUERY_CI_BY_ID = """ diff --git a/cmdb-api/api/lib/cmdb/value.py b/cmdb-api/api/lib/cmdb/value.py index 4e8f71a..b3895fc 100644 --- a/cmdb-api/api/lib/cmdb/value.py +++ b/cmdb-api/api/lib/cmdb/value.py @@ -77,7 +77,7 @@ class AttributeValueManager(object): else: res[field_name] = ValueTypeMap.serialize[attr.value_type](rs[0].value) if rs else None - if field_name in enum_map: + if enum_map and field_name in enum_map: if attr.is_list: res[field_name] = [enum_map[field_name].get(i, i) for i in res[field_name]] else: