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 9eb464a8026bc7e5f8169bf13898be33adcc8a90..b4c5954683132a2599faf0439a1a0c0cc1fd5633 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; }