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 d1006f3c424e3e51e3d095bc77d5b9b9320c3439..44379cc06ec6442073b1ffaa377186d3dbf1cfd8 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
@@ -119,6 +119,14 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper {
      */
     List<CiEntityVo> getVirtualCiEntityBaseInfoByName(CiEntityVo ciEntityVo);
 
+    /**
+     * 根据配置项名称模糊匹配获取虚拟模型配置项
+     *
+     * @param ciEntityVo 条件
+     * @return 配置项列表
+     */
+    List<CiEntityVo> getVirtualCiEntityBaseInfoByLikeName(CiEntityVo ciEntityVo);
+
     /**
      * 根据id列表返回多个配置项基本信息
      *
@@ -206,6 +214,8 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper {
 
     List<CiEntityVo> getCiEntityListByCiIdListAndName(CiEntityVo ciEntityVo);
 
+    List<CiEntityVo> getCiEntityListByCiIdListAndLikeName(CiEntityVo ciEntityVo);
+
     List<Long> searchExpiredCiEntityId(CiEntityVo ciEntityVo);
 
     Long getCiEntityIdByCiNameAndCiEntityName(@Param("ciName") String ciName, @Param("ciEntityName") String ciEntityName);
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 0d7f9909dc79a739f558a96017d291580818f0cb..7923ce35c1146aa2ee9bcc44160047f58d368a95 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
@@ -333,6 +333,13 @@
         WHERE name = #{name}
     </select>
 
+    <select id="getVirtualCiEntityBaseInfoByLikeName" parameterType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo"
+            resultType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo" useCache="false">
+        SELECT id, `name`
+        FROM ${ciTableName}
+        WHERE name LIKE CONCAT('%',#{name}, '%')
+    </select>
+
     <select id="getCiEntityBaseInfoByName" parameterType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo"
             resultType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo" useCache="false">
         SELECT id,
@@ -1475,6 +1482,25 @@
         AND `name` = #{name}
     </select>
 
+    <select id="getCiEntityListByCiIdListAndLikeName" parameterType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo"
+            resultType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo" useCache="false">
+        SELECT `id`,
+        `uuid`,
+        `ci_id` AS ciId,
+        `name`,
+        `status`,
+        `fcu`,
+        `fcd`,
+        `lcu`,
+        `lcd`
+        FROM `cmdb_cientity`
+        WHERE `ci_id` in
+        <foreach collection="idList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND `name` LIKE CONCAT('%', #{name}, '%')
+    </select>
+
     <select id="getDownwardCiEntityByLRLimitSize" resultType="neatlogic.framework.cmdb.dto.cientity.CiEntityVo"
             useCache="false">
         SELECT a.`id`,
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.java
index b358819c79ea342e8bb57a29142cb1db8f50e94f..365a800800a93d0fbde8330044f6854f3b9d40fc 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.java
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.java
@@ -59,6 +59,14 @@ public interface RelEntityMapper {
     List<RelEntityVo> getRelEntityByToCiEntityIdAndRelId(@Param("toCiEntityId") Long toCiEntityId,
                                                          @Param("relId") Long relId, @Param("limit") Long limit);
 
+    List<RelEntityVo> getRelEntityByRelIdAndLikeToCiEntityName(RelEntityVo relEntityVo);
+
+    List<RelEntityVo> getRelEntityByRelIdAndToCiEntityName(RelEntityVo relEntityVo);
+
+    List<RelEntityVo> getRelEntityByRelIdAndLikeFromCiEntityName(RelEntityVo relEntityVo);
+
+    List<RelEntityVo> getRelEntityByRelIdAndFromCiEntityName(RelEntityVo relEntityVo);
+
     List<Long> getFromToCiEntityIdByCiEntityIdList(@Param("idList") List<Long> idList);
 
     List<Long> getFromToCiEntityIdByCiEntityId(Long ciEntityId);
@@ -90,5 +98,4 @@ public interface RelEntityMapper {
                                                          @Param("toCiEntityId") Long toCiEntityId);
 
     void deleteRelEntityBySourceRelEntityId(Long sourceRelEntityId);
-
 }
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.xml
index 2730019ec63f5e0f232d16ccfbba76a67ec2d62e..c7f754fa3548f7fb5e01ee5d99ef0cef0f901754 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/RelEntityMapper.xml
@@ -313,6 +313,94 @@ limitations under the License.
         ORDER BY id
     </select>
 
+    <select id="getRelEntityByRelIdAndLikeToCiEntityName" parameterType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo" resultType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo">
+        SELECT
+            a.`id`,
+            a.`rel_id` AS relId,
+            a.`from_cientity_id` AS fromCiEntityId,
+            a.`to_cientity_id` AS toCiEntityId,
+            a.`transaction_id` AS transactionId,
+            b.`name` AS fromCiEntityName,
+            c.`name` AS toCiEntityName,
+            a.`valid_day` AS validDay,
+            b.`ci_id` AS fromCiId,
+            c.`ci_id` AS toCiId,
+            'to' AS direction
+        FROM `cmdb_relentity` a
+        JOIN `cmdb_cientity` b ON a.`from_cientity_id` = b.id
+        JOIN `cmdb_cientity` c ON a.`to_cientity_id` = c.id
+        WHERE c.`name` LIKE  CONCAT('%', #{toCiEntityName}, '%')
+          AND a.rel_id = #{relId}
+          AND ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.from_cientity_id)
+          or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.from_cientity_id and xx.expired_time &gt;= NOW()))
+    </select>
+
+    <select id="getRelEntityByRelIdAndToCiEntityName" parameterType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo" resultType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo">
+        SELECT
+            a.`id`,
+            a.`rel_id` AS relId,
+            a.`from_cientity_id` AS fromCiEntityId,
+            a.`to_cientity_id` AS toCiEntityId,
+            a.`transaction_id` AS transactionId,
+            b.`name` AS fromCiEntityName,
+            c.`name` AS toCiEntityName,
+            a.`valid_day` AS validDay,
+            b.`ci_id` AS fromCiId,
+            c.`ci_id` AS toCiId,
+            'to' AS direction
+        FROM `cmdb_relentity` a
+        JOIN `cmdb_cientity` b ON a.`from_cientity_id` = b.id
+        JOIN `cmdb_cientity` c ON a.`to_cientity_id` = c.id
+        WHERE c.`name` = #{toCiEntityName}
+          AND a.rel_id = #{relId}
+          AND ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.from_cientity_id)
+          or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.from_cientity_id and xx.expired_time &gt;= NOW()))
+    </select>
+
+    <select id="getRelEntityByRelIdAndLikeFromCiEntityName" parameterType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo" resultType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo">
+        SELECT
+            a.`id`,
+            a.`rel_id` AS relId,
+            a.`from_cientity_id` AS fromCiEntityId,
+            a.`to_cientity_id` AS toCiEntityId,
+            a.`transaction_id` AS transactionId,
+            b.`name` AS fromCiEntityName,
+            c.`name` AS toCiEntityName,
+            a.`valid_day` AS validDay,
+            b.`ci_id` AS fromCiId,
+            c.`ci_id` AS toCiId,
+            'from' as direction
+        FROM `cmdb_relentity` a
+        JOIN `cmdb_cientity` b ON a.`from_cientity_id` = b.id
+        JOIN `cmdb_cientity` c ON a.`to_cientity_id` = c.id
+        WHERE b.`name` LIKE CONCAT('%', #{fromCiEntityName}, '%')
+          AND a.rel_id = #{relId}
+          AND ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.to_cientity_id)
+          or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.to_cientity_id and xx.expired_time &gt;= NOW()))
+    </select>
+
+    <select id="getRelEntityByRelIdAndFromCiEntityName" parameterType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo" resultType="neatlogic.framework.cmdb.dto.cientity.RelEntityVo">
+        SELECT
+        a.`id`,
+        a.`rel_id` AS relId,
+        a.`from_cientity_id` AS fromCiEntityId,
+        a.`to_cientity_id` AS toCiEntityId,
+        a.`transaction_id` AS transactionId,
+        b.`name` AS fromCiEntityName,
+        c.`name` AS toCiEntityName,
+        a.`valid_day` AS validDay,
+        b.`ci_id` AS fromCiId,
+        c.`ci_id` AS toCiId,
+        'from' as direction
+        FROM `cmdb_relentity` a
+        JOIN `cmdb_cientity` b ON a.`from_cientity_id` = b.id
+        JOIN `cmdb_cientity` c ON a.`to_cientity_id` = c.id
+        WHERE b.`name` = #{fromCiEntityName}
+        AND a.rel_id = #{relId}
+        AND ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.to_cientity_id)
+        or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = a.to_cientity_id and xx.expired_time &gt;= NOW()))
+    </select>
+
     <select id="getFromToCiEntityIdByCiEntityIdList" resultType="java.lang.Long">
         SELECT
         a.`to_cientity_id`
diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
index 64c0628cb8d09581be4c2a8e7d76c7c2676546c2..c326b3f043cb196208dc0fda9209547293e37080 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -821,6 +821,7 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                 if (textFieldFilter != null && (valueFieldFilter == null || !Objects.equals(valueFieldFilter.getUuid(), textFieldFilter.getUuid()))) {
                     filterList.add(new MatrixFilterVo(textFieldFilter.getUuid(), textFieldFilter.getExpression(), Arrays.asList(textFieldFilter.getValue())));
                 }
+                boolean flag = true;
                 for (MatrixFilterVo matrixFilterVo : filterList) {
                     if (matrixFilterVo == null) {
                         continue;
@@ -849,6 +850,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 AttrFilterVo attrFilterVo = convertAttrFilter(attrVo, matrixFilterVo.getExpression(), valueList);
                                 if (attrFilterVo != null) {
                                     attrFilters.add(attrFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -859,6 +862,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 RelFilterVo relFilterVo = convertFromRelFilter(relVo, matrixFilterVo.getExpression(), valueList, "from");
                                 if (relFilterVo != null) {
                                     relFilters.add(relFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -869,6 +874,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 RelFilterVo relFilterVo = convertFromRelFilter(relVo, matrixFilterVo.getExpression(), valueList, "to");
                                 if (relFilterVo != null) {
                                     relFilters.add(relFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -896,9 +903,11 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                             break;
                     }
                 }
-                ciEntityVo.setAttrFilterList(attrFilters);
-                ciEntityVo.setRelFilterList(relFilters);
-                tbodyArray.addAll(accessSearchCiEntity(matrixUuid, ciEntityVo));
+                if (flag) {
+                    ciEntityVo.setAttrFilterList(attrFilters);
+                    ciEntityVo.setRelFilterList(relFilters);
+                    tbodyArray.addAll(accessSearchCiEntity(matrixUuid, ciEntityVo));
+                }
             }
         } else {
             List<AttrFilterVo> attrFilters = new ArrayList<>();
@@ -909,6 +918,7 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                 MatrixFilterVo matrixFilterVo = new MatrixFilterVo(keywordColumn, Expression.LIKE.getExpression(), Arrays.asList(dataVo.getKeyword()));
                 filterList.add(matrixFilterVo);
             }
+            boolean flag = true;
             if (CollectionUtils.isNotEmpty(filterList)) {
                 for (MatrixFilterVo matrixFilterVo : filterList) {
                     if (matrixFilterVo == null) {
@@ -938,6 +948,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 AttrFilterVo attrFilterVo = convertAttrFilter(attrVo, matrixFilterVo.getExpression(), valueList);
                                 if (attrFilterVo != null) {
                                     attrFilters.add(attrFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -948,6 +960,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 RelFilterVo relFilterVo = convertFromRelFilter(relVo, matrixFilterVo.getExpression(), valueList, "from");
                                 if (relFilterVo != null) {
                                     relFilters.add(relFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -958,6 +972,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                                 RelFilterVo relFilterVo = convertFromRelFilter(relVo, matrixFilterVo.getExpression(), valueList, "to");
                                 if (relFilterVo != null) {
                                     relFilters.add(relFilterVo);
+                                } else {
+                                    flag = false;
                                 }
                             }
                             break;
@@ -987,6 +1003,9 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                 }
             }
 
+            if (!flag) {
+                return resultList;
+            }
             ciEntityVo.setAttrFilterList(attrFilters);
             ciEntityVo.setRelFilterList(relFilters);
             //下面逻辑适用于下拉框滚动加载，也可以搜索，但是一页返回的数据量可能会小于pageSize，因为做了去重处理
@@ -1023,42 +1042,51 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
     }
 
     private AttrFilterVo convertAttrFilter(AttrVo attrVo, String expression, List<String> valueList) {
+        if (StringUtils.isBlank(expression)) {
+            expression = Expression.EQUAL.getExpression();
+        }
+        AttrFilterVo attrFilterVo = new AttrFilterVo();
+        attrFilterVo.setAttrId(attrVo.getId());
+        attrFilterVo.setExpression(expression);
         if ("select".equals(attrVo.getType())) {
             CiVo targetCiVo = ciMapper.getCiById(attrVo.getTargetCiId());
             if (targetCiVo == null) {
                 return null;
             }
+            List<CiVo> downwardCiList = ciMapper.getDownwardCiListByLR(targetCiVo.getLft(), targetCiVo.getRht());
+            Map<Long, CiVo> downwardCiMap = downwardCiList.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
+
+            CiEntityVo ciEntityVo = new CiEntityVo();
+            ciEntityVo.setCiId(targetCiVo.getId());
+            ciEntityVo.setIdList(new ArrayList<>(downwardCiMap.keySet()));
             List<String> newValueList = new ArrayList<>();
             for (String value : valueList) {
+                List<CiEntityVo> ciEntityList = new ArrayList<>();
+                ciEntityVo.setName(value);
                 if (Objects.equals(targetCiVo.getIsVirtual(), 1)) {
-                    CiEntityVo ciEntityVo = new CiEntityVo();
-                    ciEntityVo.setCiId(targetCiVo.getId());
-                    ciEntityVo.setName(value);
-                    List<CiEntityVo> ciEntityList = ciEntityMapper.getVirtualCiEntityBaseInfoByName(ciEntityVo);
-                    if (CollectionUtils.isEmpty(ciEntityList)) {
-                        return null;
-                    }
-                    for (CiEntityVo ciEntity : ciEntityList) {
-                        newValueList.add(ciEntity.getId().toString());
+                    if (Objects.equals(expression, Expression.LIKE.getExpression())) {
+                        ciEntityList = ciEntityMapper.getVirtualCiEntityBaseInfoByLikeName(ciEntityVo);
+                    } else {
+                        ciEntityList = ciEntityMapper.getVirtualCiEntityBaseInfoByName(ciEntityVo);
                     }
                 } else {
-                    Long ciEntityId = ciEntityMapper.getIdByCiIdAndName(targetCiVo.getId(), value);
-                    if (ciEntityId == null) {
-                        return null;
+                    if (Objects.equals(expression, Expression.LIKE.getExpression())) {
+                        ciEntityList = ciEntityMapper.getCiEntityListByCiIdListAndLikeName(ciEntityVo);
+                    } else {
+                        ciEntityList = ciEntityMapper.getCiEntityListByCiIdListAndName(ciEntityVo);
                     }
-                    newValueList.add(ciEntityId.toString());
+                }
+                for (CiEntityVo ciEntity : ciEntityList) {
+                    newValueList.add(ciEntity.getId().toString());
                 }
             }
-            valueList = newValueList;
-        }
-        AttrFilterVo attrFilterVo = new AttrFilterVo();
-        attrFilterVo.setAttrId(attrVo.getId());
-        if (StringUtils.isNotBlank(expression)) {
-            attrFilterVo.setExpression(expression);
+            if (CollectionUtils.isEmpty(newValueList)) {
+                return null;
+            }
+            attrFilterVo.setValueList(newValueList);
         } else {
-            attrFilterVo.setExpression(Expression.EQUAL.getExpression());
+            attrFilterVo.setValueList(valueList);
         }
-        attrFilterVo.setValueList(valueList);
         return attrFilterVo;
     }
 
@@ -1075,39 +1103,35 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
         if (ciVo == null) {
             return null;
         }
+        if (StringUtils.isBlank(expression)) {
+            expression = Expression.EQUAL.getExpression();
+        }
         List<Long> ciEntityIdList = new ArrayList<>();
         for (String value : valueList) {
-            if (Objects.equals(ciVo.getIsVirtual(), 1)) {
-                CiEntityVo ciEntityVo = new CiEntityVo();
-                ciEntityVo.setCiId(ciVo.getId());
-                ciEntityVo.setName(value);
-                List<CiEntityVo> ciEntityList = ciEntityMapper.getVirtualCiEntityBaseInfoByName(ciEntityVo);
-                if (CollectionUtils.isEmpty(ciEntityList)) {
-                    return null;
+            RelEntityVo relEntityVo = new RelEntityVo();
+            relEntityVo.setRelId(relVo.getId());
+            relEntityVo.setPageSize(100);
+            if ("from".equals(direction)) {
+                relEntityVo.setToCiEntityName(value);
+                List<RelEntityVo> relEntityList = new ArrayList<>();
+                if (Objects.equals(expression, Expression.LIKE.getExpression())) {
+                    relEntityList = relEntityMapper.getRelEntityByRelIdAndLikeToCiEntityName(relEntityVo);
+                } else {
+                    relEntityList = relEntityMapper.getRelEntityByRelIdAndToCiEntityName(relEntityVo);
                 }
-                for (CiEntityVo ciEntity : ciEntityList) {
-                    ciEntityIdList.add(ciEntity.getId());
+                for (RelEntityVo relEntity : relEntityList) {
+                    ciEntityIdList.add(relEntity.getToCiEntityId());
                 }
-            } else {
-                RelEntityVo relEntityVo = new RelEntityVo();
-                relEntityVo.setRelId(relVo.getId());
-                relEntityVo.setPageSize(100);
-                List<RelEntityVo> relEntityList = relEntityMapper.getRelEntityByRelId(relEntityVo);
-                if (CollectionUtils.isEmpty(relEntityList)) {
-                    return null;
+            } else if ("to".equals(direction)) {
+                relEntityVo.setFromCiEntityName(value);
+                List<RelEntityVo> relEntityList = new ArrayList<>();
+                if (Objects.equals(expression, Expression.LIKE.getExpression())) {
+                    relEntityList = relEntityMapper.getRelEntityByRelIdAndLikeFromCiEntityName(relEntityVo);
+                } else {
+                    relEntityList = relEntityMapper.getRelEntityByRelIdAndFromCiEntityName(relEntityVo);
                 }
                 for (RelEntityVo relEntity : relEntityList) {
-                    if ("from".equals(direction)) {
-                        if (value.equals(relEntity.getToCiEntityName())) {
-                            ciEntityIdList.add(relEntity.getToCiEntityId());
-                            break;
-                        }
-                    } else if ("to".equals(direction)) {
-                        if (value.equals(relEntity.getFromCiEntityName())) {
-                            ciEntityIdList.add(relEntity.getFromCiEntityId());
-                            break;
-                        }
-                    }
+                    ciEntityIdList.add(relEntity.getFromCiEntityId());
                 }
             }
         }