diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.java
index 515ab3f0d487b2373e9a44133eb459de1ae07ec5..3ffd411e5857e675c9e25bde2b70662676be7890 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.java
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.java
@@ -99,6 +99,8 @@ public interface CiMapper extends ICiCrossoverMapper {
 
     CiVo getCiByLabel(String ciLabel);
 
+    List<CiVo> getCiListByLabelList(List<String> ciLabelList);
+
     int getVirtualCiCount();
 
     List<CiVo> getVirtualCiList(BasePageVo searchVo);
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 3b6e1b8e9c108a04a44e324dc4dee4312709f5a5..ee2de79a429fe84a42d128996f5d24addce45e10 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
@@ -660,6 +660,37 @@
         WHERE a.label = #{value}
     </select>
 
+    <select id="getCiListByLabelList" parameterType="java.lang.String" resultMap="ciResultMap"
+            useCache="true">
+        SELECT a.`id`,
+               a.`name`,
+               a.`label`,
+               a.`description`,
+               a.`icon`,
+               a.`type_id`      AS typeId,
+               d.`name`         AS typeName,
+               a.`is_private`   AS isPrivate,
+               a.`is_menu`      AS isMenu,
+               a.`parent_ci_id` AS parentCiId,
+               c.label          AS parentCiLabel,
+               c.name           AS parentCiName,
+               a.`is_abstract`  AS isAbstract,
+               a.`is_virtual`   AS isVirtual,
+               a.`expired_day`  AS expiredDay,
+               a.`name_attr_id` AS nameAttrId,
+               a.`lft`          AS lft,
+               a.`rht`          AS rht,
+               b.`attr_id`      AS uniqueAttrId
+        FROM `cmdb_ci` a
+                 LEFT JOIN `cmdb_ci_unique` b ON a.id = b.ci_id
+                 LEFT JOIN `cmdb_ci` c ON a.`parent_ci_id` = c.id
+                 LEFT JOIN `cmdb_citype` d ON a.`type_id` = d.id
+        WHERE a.label in
+        <foreach collection="list" item="label" open="(" separator="," close=")">
+            #{label}
+        </foreach>
+    </select>
+
     <select id="getVirtualCiCount" resultType="int">
         SELECT COUNT(1)
         FROM `cmdb_ci`
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 87feb463492dc7864da539a72c1de7faa3631e82..64c0628cb8d09581be4c2a8e7d76c7c2676546c2 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -875,15 +875,23 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                         case "const":
                             //固化属性需要特殊处理
                             if ("const_id".equals(label)) {
-                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
-                            } else if ("const_ciLabel".equals(label)) {
-                                String ciLabel = valueList.get(0);
-                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
-                                if (ciVo != null) {
-                                    ciEntityVo.setFilterCiId(ciVo.getId());
-                                } else {
-                                    ciEntityVo.setFilterCiId(-1L);
+//                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
+                                List<Long> idList = new ArrayList<>();
+                                for (String value : valueList) {
+                                    idList.add(Long.valueOf(value));
                                 }
+                                ciEntityVo.setIdList(idList);
+                            } else if ("const_ciLabel".equals(label)) {
+//                                String ciLabel = valueList.get(0);
+//                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+//                                if (ciVo != null) {
+//                                    ciEntityVo.setFilterCiId(ciVo.getId());
+//                                } else {
+//                                    ciEntityVo.setFilterCiId(-1L);
+//                                }
+                                List<CiVo> ciList = ciMapper.getCiListByLabelList(valueList);
+                                List<Long> filterCiIdList = ciList.stream().map(CiVo::getId).collect(Collectors.toList());
+                                ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
                     }
@@ -956,15 +964,23 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                         case "const":
                             //固化属性需要特殊处理
                             if ("const_id".equals(label)) {
-                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
-                            } else if ("const_ciLabel".equals(label)) {
-                                String ciLabel = valueList.get(0);
-                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
-                                if (ciVo != null) {
-                                    ciEntityVo.setFilterCiId(ciVo.getId());
-                                } else {
-                                    ciEntityVo.setFilterCiId(-1L);
+//                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
+                                List<Long> idList = new ArrayList<>();
+                                for (String value : valueList) {
+                                    idList.add(Long.valueOf(value));
                                 }
+                                ciEntityVo.setIdList(idList);
+                            } else if ("const_ciLabel".equals(label)) {
+//                                String ciLabel = valueList.get(0);//
+//                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+//                                if (ciVo != null) {
+//                                    ciEntityVo.setFilterCiId(ciVo.getId());
+//                                } else {
+//                                    ciEntityVo.setFilterCiId(-1L);
+//                                }
+                                List<CiVo> ciList = ciMapper.getCiListByLabelList(valueList);
+                                List<Long> filterCiIdList = ciList.stream().map(CiVo::getId).collect(Collectors.toList());
+                                ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
                     }