From 74422775fec33b6df50d8d340ad64ff89f4b5d60 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 29 Nov 2024 17:55:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A7=86=E5=9B=BE=E7=B1=BB=E5=9E=8B=E7=9A=84=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E9=80=89=E4=B8=8D=E5=88=B0=E5=85=A8=E5=B1=80=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1299385969770496]自定义视图类型的矩阵选不到全局属性环境 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1299385969770496 --- .../CmdbCustomViewDataSourceHandler.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java index 9eb464a8..b4c59546 100644 --- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java +++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CmdbCustomViewDataSourceHandler.java @@ -403,6 +403,33 @@ public class CmdbCustomViewDataSourceHandler extends MatrixDataSourceHandlerBase matrixAttributeVo.setPrimaryKey(attrVo.getIsPrimary()); matrixAttributeList.add(matrixAttributeVo); } + CustomViewGlobalAttrVo customViewGlobalAttrVo = new CustomViewGlobalAttrVo(customViewId); + List globalAttrList = customViewMapper.getCustomViewGlobalAttrByCustomViewId(customViewGlobalAttrVo); + for (CustomViewGlobalAttrVo globalAttrVo : globalAttrList) { + MatrixAttributeVo matrixAttributeVo = new MatrixAttributeVo(); + if (MapUtils.isNotEmpty(showAttributeUuidMap)) { + String uniqueIdentifier = showAttributeUniqueIdentifierMap.get(globalAttrVo.getUuid()); + if (StringUtils.isNotBlank(uniqueIdentifier)) { + matrixAttributeVo.setUniqueIdentifier(uniqueIdentifier); + } else { + matrixAttributeVo.setUniqueIdentifier(StringUtils.EMPTY); + } + String uuid = showAttributeUuidMap.get(globalAttrVo.getUuid()); + if (uuid == null && Objects.equals(globalAttrVo.getIsPrimary(), 0)) { + continue; + } + matrixAttributeVo.setUuid(uuid); + } + matrixAttributeVo.setLabel(globalAttrVo.getUuid()); + matrixAttributeVo.setName(globalAttrVo.getAlias()); + matrixAttributeVo.setMatrixUuid(matrixUuid); + matrixAttributeVo.setType(MatrixAttributeType.INPUT.getValue()); + matrixAttributeVo.setIsDeletable(0); + matrixAttributeVo.setSort(sort++); + matrixAttributeVo.setIsRequired(0); + matrixAttributeVo.setPrimaryKey(globalAttrVo.getIsPrimary()); + matrixAttributeList.add(matrixAttributeVo); + } return matrixAttributeList; } -- Gitee