diff --git a/src/views/pages/cmdb/cientity/cientity-manage.vue b/src/views/pages/cmdb/cientity/cientity-manage.vue
index c5f7f2eb91c189cfb7fbc4d7a9680cda8e4b2544..465f25b4ca418ea326b9b31bfd20061873938581 100644
--- a/src/views/pages/cmdb/cientity/cientity-manage.vue
+++ b/src/views/pages/cmdb/cientity/cientity-manage.vue
@@ -237,15 +237,19 @@ export default {
       });
     },
     searchCiTypeCi: function() {
+      this.ciTypeList = [];
       this.isLoading = true;
       this.$addHistoryData('searchParam', this.searchParam);
       this.$api.cmdb.ci.searchCiTypeCi(this.searchParam).then(res => {
         if (res.Status == 'OK') {
-          this.ciTypeList = res.Return;
           this.isLoading = false;
-          this.ciTypeList.forEach(citype => {
-            citype.cardList = citype.ciList;
-          });
+          let ciTypeList = res.Return || [];
+          this.ciTypeList = ciTypeList
+            .filter(citype => citype && !this.$utils.isEmpty(citype.ciList))
+            .map(citype => ({
+              ...citype,
+              cardList: citype.ciList
+            }));
         }
       });
     },