From dc28ae8d80ed9eb9341ecd4fffa8deb82ddf871f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 17 Apr 2025 18:01:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20cmdb=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9F=A9=E9=98=B5=E9=80=9A=E8=BF=87=E5=85=A8=E5=B1=80=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E8=BF=87=E6=BB=A4=E6=97=B6=E4=BD=BF=E7=94=A8=E4=B8=A5?= =?UTF-8?q?=E6=A0=BC=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1401534863081472]cmdb类型矩阵通过全局属性过滤时使用严格模式 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1401534863081472 --- .../module/cmdb/matrix/handler/CiDataSourceHandler.java | 2 ++ .../cmdb/process/stephandler/CmdbSyncProcessComponent.java | 1 + .../module/cmdb/workerdispatcher/handler/CmdbDispatcher.java | 1 + 3 files changed, 4 insertions(+) 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 956fc42c..f419ce14 100644 --- a/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java +++ b/src/main/java/neatlogic/module/cmdb/matrix/handler/CiDataSourceHandler.java @@ -352,6 +352,7 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase { list = ciEntityList; } else { ciEntityVo.setCurrentPage(currentPage); + ciEntityVo.setGlobalAttrStrictMode(true); list = ciEntityService.searchCiEntity(ciEntityVo); } if (CollectionUtils.isNotEmpty(list)) { @@ -1162,6 +1163,7 @@ public class CiDataSourceHandler extends MatrixDataSourceHandlerBase { try { MatrixCiVo matrixCiVo = matrixMapper.getMatrixCiByMatrixUuid(matrixUuid); setAttrIdListAndRelIdListFromMatrixConfig(matrixCiVo, ciEntityVo); + ciEntityVo.setGlobalAttrStrictMode(true); List ciEntityList = ciEntityService.searchCiEntity(ciEntityVo); if (CollectionUtils.isNotEmpty(ciEntityList)) { List viewConstNameList = new ArrayList<>(); diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java index d3f45962..8d0ae724 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java @@ -759,6 +759,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { ciEntityConditionVo.addAttrFilter(filterVo); } if (CollectionUtils.isNotEmpty(ciEntityConditionVo.getAttrFilterList())) { + ciEntityConditionVo.setGlobalAttrStrictMode(true); List checkList = ciEntityService.searchCiEntity(ciEntityConditionVo); if (CollectionUtils.isNotEmpty(checkList)) { return checkList.get(0).getId(); diff --git a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java index ab91db22..ba200b14 100644 --- a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java +++ b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java @@ -176,6 +176,7 @@ public class CmdbDispatcher extends WorkerDispatcherBase { ciEntityConditionVo.addAttrFilter(filterVo); } } + ciEntityConditionVo.setGlobalAttrStrictMode(true); List checkList = ciEntityService.searchCiEntity(ciEntityConditionVo); if (CollectionUtils.isEmpty(checkList)) { throw new CmdbDispatcherDispatchFailedException(ci, ciEntityConditionVo.getAttrFilterList()); -- Gitee