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 956fc42cc54e3e7f5b4c05c6ebdf1aeb59143f36..f419ce14f1f3bb265c14f78a4febd544eee2229a 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 d3f45962ee7f8a40cb01fe58983959c99bae9d58..8d0ae724b13b511eb792bb93c905976250968b0b 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 ab91db22e667ae6923186b04ddd071004526c0cf..ba200b14f013f5c48f79a21bf62dea584fc3d917 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());