Merge branch 'fix/SvCore_authoriseDqoByConfigType' into 'master'

ristepejov · ristepejov · commit 5480fb55681a · 2026-07-03T14:13:45.000Z
fix authoriseDqoByConfigType

See merge request svarog4/svarog!22
diff --git a/src/com/prtech/svarog/SvCore.java b/src/com/prtech/svarog/SvCore.java
@@ -2799,8 +2799,10 @@ protected boolean authoriseDqoByConfigType(DbQueryObject dqo, HashMap<String, Db
 				if (accessType.getAccessLevelValue() >= accessLevel.getAccessLevelValue()) {
 					hasAccess = true;
 					try {
-						subCfgDbx.addDbSearchItem(
-								new DbSearchCriterion(cfgFieldName, DbCompareOperand.EQUAL, permItem.getKey()));
+						DbSearchCriterion criterion = new DbSearchCriterion(cfgFieldName, DbCompareOperand.EQUAL,
+								permItem.getKey());
+						criterion.setNextCritOperand(DbLogicOperand.OR.toString());
+						subCfgDbx.addDbSearchItem(criterion);
 					} catch (SvException e) {
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -2799,8 +2799,10 @@ protected boolean authoriseDqoByConfigType(DbQueryObject dqo, HashMap<String, Db`
`2799`	`2799`	`if (accessType.getAccessLevelValue() >= accessLevel.getAccessLevelValue()) {`
`2800`	`2800`	`hasAccess = true;`
`2801`	`2801`	`try {`
`2802`		`- subCfgDbx.addDbSearchItem(`
`2803`		`- new DbSearchCriterion(cfgFieldName, DbCompareOperand.EQUAL, permItem.getKey()));`
	`2802`	`+ DbSearchCriterion criterion = new DbSearchCriterion(cfgFieldName, DbCompareOperand.EQUAL,`
	`2803`	`+ permItem.getKey());`
	`2804`	`+ criterion.setNextCritOperand(DbLogicOperand.OR.toString());`
	`2805`	`+ subCfgDbx.addDbSearchItem(criterion);`
`2804`	`2806`	`} catch (SvException e) {`
`2805`	`2807`	`}`
`2806`	`2808`	`}`