[KNOWAGE-9679] exclude other tenants documents when retrieving folders

eng-dedalus · eng-dedalus · commit 70d5bb766e34 · 2026-02-03T16:00:26.000+01:00
diff --git a/knowagedao/src/main/java/it/eng/spagobi/analiticalmodel/functionalitytree/dao/LowFunctionalityDAOHibImpl.java b/knowagedao/src/main/java/it/eng/spagobi/analiticalmodel/functionalitytree/dao/LowFunctionalityDAOHibImpl.java
@@ -969,7 +969,7 @@ public LowFunctionality toLowFunctionality(SbiFunctions hibFunct, boolean recove
 
 						if (date != null) {
 							SbiObjects sbiObj = hibObjFunc.getId().getSbiObjects();
-							if (status != null && !filteringStatusList.contains(sbiObj.getStateCode())) {
+							if (status != null && !filteringStatusList.contains(sbiObj.getStateCode()) || !sbiObj.getCommonInfo().getOrganization().equals(getTenant())) {
 								continue;
 							}
 
@@ -986,7 +986,7 @@ public LowFunctionality toLowFunctionality(SbiFunctions hibFunct, boolean recove
 
 						} else if (status != null) {
 							SbiObjects sbiObj = hibObjFunc.getId().getSbiObjects();
-							if (!filteringStatusList.contains(sbiObj.getStateCode())) {
+							if (!filteringStatusList.contains(sbiObj.getStateCode()) || !sbiObj.getCommonInfo().getOrganization().equals(getTenant())) {
 								continue;
 							}
 							biObjects.add(object);

Original file line number	Diff line number	Diff line change
`@@ -969,7 +969,7 @@ public LowFunctionality toLowFunctionality(SbiFunctions hibFunct, boolean recove`
`969`	`969`
`970`	`970`	`if (date != null) {`
`971`	`971`	`SbiObjects sbiObj = hibObjFunc.getId().getSbiObjects();`
`972`		`- if (status != null && !filteringStatusList.contains(sbiObj.getStateCode())) {`
	`972`	`+ if (status != null && !filteringStatusList.contains(sbiObj.getStateCode()) \|\| !sbiObj.getCommonInfo().getOrganization().equals(getTenant())) {`
`973`	`973`	`continue;`
`974`	`974`	`}`
`975`	`975`
`@@ -986,7 +986,7 @@ public LowFunctionality toLowFunctionality(SbiFunctions hibFunct, boolean recove`
`986`	`986`
`987`	`987`	`} else if (status != null) {`
`988`	`988`	`SbiObjects sbiObj = hibObjFunc.getId().getSbiObjects();`
`989`		`- if (!filteringStatusList.contains(sbiObj.getStateCode())) {`
	`989`	`+ if (!filteringStatusList.contains(sbiObj.getStateCode()) \|\| !sbiObj.getCommonInfo().getOrganization().equals(getTenant())) {`
`990`	`990`	`continue;`
`991`	`991`	`}`
`992`	`992`	`biObjects.add(object);`