diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml
index 962c0990ed7339b95ff2d2e5f2339df80096d390..6cca1aeb6ad8ad19594225c070be5560f000c4d0 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml
@@ -116,7 +116,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         select id,
                name,
                label,
-               type_id as typeId,
+               type_id     as typeId,
+               is_virtual  as isVirtual,
+               is_abstract as isAbstract,
                icon,
                lft,
                rht
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java
index dea95cc51f477018769c8b6a3568d45c1c541f1c..cdc298dfd7a6c87354a83c54185e17bd6a383df0 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java
@@ -200,6 +200,8 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper {
      */
     List<AttrVo> getAttrListByToCiEntityId(Long toCiEntityId);
 
+    List<CiEntityVo> getCiEntityNameByIdList(@Param("idList") List<Long> idList);
+
     List<HashMap<String, Object>> searchCiEntity(CiEntityVo ciEntityVo);
 
     List<Long> searchCiEntityId(CiEntityVo ciEntityVo);
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml
index cac1995812f2a61b61752fe123922caf13cf7a9b..74340156e1774388a4f0e71cc9c07cf9960ad0b6 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml
@@ -163,11 +163,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                                 left join cmdb_relentity `rel_${idx}` on cientity.id = `rel_${idx}`.from_cientity_id
                                 and `rel_${idx}`.rel_id = #{rel.id}
                                 <!--过期配置项过滤开始-->
-                               and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.to_cientity_id) or exists
-                               (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.to_cientity_id
-                               and xx.expired_time &gt;= NOW()))
+                                and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.to_cientity_id) or exists
+                                (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.to_cientity_id
+                                and xx.expired_time &gt;= NOW()))
                                 <!--过期配置项过滤结束-->
                                 <if test="globalAttrFilterList != null and globalAttrFilterList.size () > 0">
                                     and
@@ -190,11 +190,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                                 left join cmdb_relentity `rel_${idx}` on cientity.id = `rel_${idx}`.to_cientity_id
                                 and `rel_${idx}`.rel_id = #{rel.id}
                                 <!--过期配置项过滤开始-->
-                               and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.from_cientity_id) or exists
-                               (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.from_cientity_id
-                               and xx.expired_time &gt;= NOW()))
+                                and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.from_cientity_id) or exists
+                                (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.from_cientity_id
+                                and xx.expired_time &gt;= NOW()))
                                 <!--过期配置项过滤结束-->
                                 <if test="globalAttrFilterList != null and globalAttrFilterList.size () > 0">
                                     and
@@ -222,11 +222,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                                 `rel_${idx}`.from_cientity_id and
                                 `rel_${idx}`.rel_id = #{rel.id}
                                 <!--过期配置项过滤开始-->
-                               and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.to_cientity_id)
-                               or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.to_cientity_id
-                               and xx.expired_time &gt;= NOW()))
+                                and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.to_cientity_id)
+                                or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.to_cientity_id
+                                and xx.expired_time &gt;= NOW()))
                                 <!--过期配置项过滤结束-->
                                 <if test="globalAttrFilterList != null and globalAttrFilterList.size () > 0">
                                     and
@@ -250,11 +250,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                                 `rel_${idx}`.to_cientity_id
                                 and `rel_${idx}`.rel_id = #{rel.id}
                                 <!--过期配置项过滤开始-->
-                               and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.from_cientity_id) or exists
-                               (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
-                               `rel_${idx}`.from_cientity_id
-                               and xx.expired_time &gt;= NOW()))
+                                and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.from_cientity_id) or exists
+                                (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id =
+                                `rel_${idx}`.from_cientity_id
+                                and xx.expired_time &gt;= NOW()))
                                 <!--过期配置项过滤结束-->
                                 <if test="globalAttrFilterList != null and globalAttrFilterList.size () > 0">
                                     and
@@ -674,7 +674,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                     <if test="@neatlogic.framework.cmdb.dao.ognl.IsCiExistsInFilter@isExists(ci, attrFilterList, sortList)">
                         <choose>
                             <when test="ci.isVirtual == 0">
-                                JOIN ${ci.ciTableName} FORCE INDEX(PRIMARY) ON `ci_base`.id = ${ci.ciTableName}.cientity_id
+                                JOIN ${ci.ciTableName} FORCE INDEX(PRIMARY) ON `ci_base`.id =
+                                ${ci.ciTableName}.cientity_id
                             </when>
                             <otherwise>
                                 JOIN ${ci.ciTableName} ON `ci_base`.id = ${ci.ciTableName}.id
@@ -1575,6 +1576,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </include>
     </select>
 
+    <select id="getCiEntityNameByIdList" resultType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo">
+        select id,
+        ci_id as ciId,
+        name from cmdb_cientity where id in
+        <foreach collection="idList" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
 
     <select id="searchCiEntity" parameterType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo"
             resultType="java.util.HashMap" useCache="true">
diff --git a/src/main/java/neatlogic/module/cmdb/fulltextindex/handler/CiEntityFullTextIndexHandler.java b/src/main/java/neatlogic/module/cmdb/fulltextindex/handler/CiEntityFullTextIndexHandler.java
index 9b395ecc1468650c229cd37493e781cdb05d9016..6cf01417b9dd620d342fcb6a71646c6b02f8b0d8 100644
--- a/src/main/java/neatlogic/module/cmdb/fulltextindex/handler/CiEntityFullTextIndexHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/fulltextindex/handler/CiEntityFullTextIndexHandler.java
@@ -38,6 +38,7 @@ import neatlogic.module.cmdb.fulltextindex.enums.CmdbFullTextIndexType;
 import neatlogic.module.cmdb.service.cientity.CiEntityService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -146,12 +147,22 @@ public class CiEntityFullTextIndexHandler extends FullTextIndexHandlerBase {
                             for (int i = 0; i < attrEntityVo.getValueList().size(); i++) {
                                 ciEntityIdList.add(attrEntityVo.getValueList().getLong(i));
                             }
-                            List<CiEntityVo> targetCiEntityList = ciEntityService.getCiEntityByIdList(attrEntityVo.getToCiId(), ciEntityIdList);
+                            List<CiEntityVo> targetCiEntityList = ciEntityService.getCiEntityNameByIdList(attrEntityVo.getToCiId(), ciEntityIdList);
                             if (CollectionUtils.isNotEmpty(targetCiEntityList)) {
-                                String v = targetCiEntityList.stream().map(CiEntityVo::getName).collect(Collectors.joining(","));
-                                fullTextIndexVo.addFieldContent(attrEntityVo.getAttrId().toString(), new FullTextIndexVo.WordVo(v));
-                                if (termAttrVo != null) {
-                                    this.addTerms(v.split(","));
+                                String v = "";
+                                for (CiEntityVo targetCiEntityVo : targetCiEntityList) {
+                                    if (StringUtils.isNotBlank(targetCiEntityVo.getName())) {
+                                        if (StringUtils.isNotBlank(v)) {
+                                            v += ",";
+                                        }
+                                        v = v + targetCiEntityVo.getName();
+                                    }
+                                }
+                                if (StringUtils.isNotBlank(v)) {
+                                    fullTextIndexVo.addFieldContent(attrEntityVo.getAttrId().toString(), new FullTextIndexVo.WordVo(v));
+                                    if (termAttrVo != null) {
+                                        this.addTerms(v.split(","));
+                                    }
                                 }
                             }
                         } else {
diff --git a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityService.java b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityService.java
index daa4d828cabce631f5a9e8e894e05f7b69142490..bdf784974579b694193c2f8a3735c0f6655a9874 100644
--- a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityService.java
+++ b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityService.java
@@ -48,6 +48,8 @@ public interface CiEntityService {
     List<CiEntityVo> getCiEntityByIdList(Long ciId, List<Long> ciEntityIdList);
 
 
+    List<CiEntityVo> getCiEntityNameByIdList(Long ciId, List<Long> ciEntityIdList);
+
     List<CiEntityVo> getCiEntityByIdList(CiEntityVo ciEntityVo);
 
     List<Long> getCiEntityIdByCiId(CiEntityVo ciEntityVo);
diff --git a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java
index 2399670eccfa2296b3b8a7715b4c3dbe907e3863..785cd05cbbc14b4f1cc8d9775c9ec312b343f466 100644
--- a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java
@@ -308,6 +308,19 @@ public class CiEntityServiceImpl implements CiEntityService, ICiEntityCrossoverS
         return getCiEntityByIdList(ciEntityVo);
     }
 
+    @Override
+    public List<CiEntityVo> getCiEntityNameByIdList(Long ciId, List<Long> ciEntityIdList) {
+        CiVo ciVo = ciMapper.getCiBaseInfoById(ciId);
+        if (ciVo.getIsVirtual().equals(0)) {
+            return ciEntityMapper.getCiEntityNameByIdList(ciEntityIdList);
+        } else {
+            CiEntityVo ciEntityVo = new CiEntityVo();
+            ciEntityVo.setCiId(ciId);
+            ciEntityVo.setIdList(ciEntityIdList);
+            return ciEntityMapper.getVirtualCiEntityBaseInfoByIdList(ciEntityVo);
+        }
+    }
+
 
     @Override
     public List<CiEntityVo> getCiEntityByIdList(CiEntityVo ciEntityVo) {