From 8163138bd9c71fadb983bb1d9e82f4a6ae215959 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 4 Mar 2024 17:53:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E4=B8=8B=E6=8B=89=E6=A1=86=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=A1=A8=E6=A0=BC=E5=B1=9E=E6=80=A7=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B1=9E=E6=80=A7=E4=BD=9C=E4=B8=BA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=EF=BC=8C=E8=BF=87=E6=BB=A4=E7=BB=93=E6=9E=9C=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=88=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1104893929029632]表单编辑-下拉框过滤表格属性，用隐藏属性作为过滤，过滤结果始终只有一个 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1104893929029632
---
 .../matrix/handler/CiDataSourceHandler.java   | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

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 87feb463..4425d73e 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -877,13 +877,21 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                             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);
+//                                String ciLabel = valueList.get(0);
+//                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+//                                if (ciVo != null) {
+//                                    ciEntityVo.setFilterCiId(ciVo.getId());
+//                                } else {
+//                                    ciEntityVo.setFilterCiId(-1L);
+//                                }
+                                List<Long> filterCiIdList = new ArrayList<>();
+                                for (String ciLabel : valueList) {
+                                    CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+                                    if (ciVo != null) {
+                                        filterCiIdList.add(ciVo.getId());
+                                    }
                                 }
+                                ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
                     }
@@ -958,13 +966,21 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                             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);
+//                                String ciLabel = valueList.get(0);//
+//                                CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+//                                if (ciVo != null) {
+//                                    ciEntityVo.setFilterCiId(ciVo.getId());
+//                                } else {
+//                                    ciEntityVo.setFilterCiId(-1L);
+//                                }
+                                List<Long> filterCiIdList = new ArrayList<>();
+                                for (String ciLabel : valueList) {
+                                    CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
+                                    if (ciVo != null) {
+                                        filterCiIdList.add(ciVo.getId());
+                                    }
                                 }
+                                ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
                     }
-- 
Gitee


From 9cfd6f3239c4c61bbbc17923470643d08f6888f2 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 4 Mar 2024 18:19:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E4=B8=8B=E6=8B=89=E6=A1=86=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=A1=A8=E6=A0=BC=E5=B1=9E=E6=80=A7=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B1=9E=E6=80=A7=E4=BD=9C=E4=B8=BA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=EF=BC=8C=E8=BF=87=E6=BB=A4=E7=BB=93=E6=9E=9C=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=88=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1104893929029632]表单编辑-下拉框过滤表格属性，用隐藏属性作为过滤，过滤结果始终只有一个 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1104893929029632
---
 .../module/cmdb/dao/mapper/ci/CiMapper.java   |  2 ++
 .../module/cmdb/dao/mapper/ci/CiMapper.xml    | 31 ++++++++++++++++++
 .../matrix/handler/CiDataSourceHandler.java   | 32 +++++++++----------
 3 files changed, 49 insertions(+), 16 deletions(-)

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 515ab3f0..3ffd411e 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 3b6e1b8e..ee2de79a 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 4425d73e..64c0628c 100644
--- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java
@@ -875,7 +875,12 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                         case "const":
                             //固化属性需要特殊处理
                             if ("const_id".equals(label)) {
-                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
+//                                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);
@@ -884,13 +889,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
 //                                } else {
 //                                    ciEntityVo.setFilterCiId(-1L);
 //                                }
-                                List<Long> filterCiIdList = new ArrayList<>();
-                                for (String ciLabel : valueList) {
-                                    CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
-                                    if (ciVo != null) {
-                                        filterCiIdList.add(ciVo.getId());
-                                    }
-                                }
+                                List<CiVo> ciList = ciMapper.getCiListByLabelList(valueList);
+                                List<Long> filterCiIdList = ciList.stream().map(CiVo::getId).collect(Collectors.toList());
                                 ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
@@ -964,7 +964,12 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
                         case "const":
                             //固化属性需要特殊处理
                             if ("const_id".equals(label)) {
-                                ciEntityVo.setFilterCiEntityId(Long.valueOf(valueList.get(0)));
+//                                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);
@@ -973,13 +978,8 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase {
 //                                } else {
 //                                    ciEntityVo.setFilterCiId(-1L);
 //                                }
-                                List<Long> filterCiIdList = new ArrayList<>();
-                                for (String ciLabel : valueList) {
-                                    CiVo ciVo = ciMapper.getCiByLabel(ciLabel);
-                                    if (ciVo != null) {
-                                        filterCiIdList.add(ciVo.getId());
-                                    }
-                                }
+                                List<CiVo> ciList = ciMapper.getCiListByLabelList(valueList);
+                                List<Long> filterCiIdList = ciList.stream().map(CiVo::getId).collect(Collectors.toList());
                                 ciEntityVo.setFilterCiIdList(filterCiIdList);
                             }
                             break;
-- 
Gitee