entaxy/entaxy-public
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ENTAXY-248 release 1.8.1

Browse Source
This commit is contained in:
Сергей Крючков
2022-02-28 15:20:38 +03:00
parent 4d274c4fcc
commit c826adf1db
1958 changed files with 195926 additions and 10280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/core/security/permission-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>
@ -20,6 +20,10 @@
<bundle.osgi.export.pkg>
ru.entaxy.esb.system.core.permission.jpa.entity
</bundle.osgi.export.pkg>
<!-- bundle.osgi.private.pkg>
ru.entaxy.esb.system.core.permission.interceptor,
ru.entaxy.esb.system.core.permission.jpa.impl
</bundle.osgi.private.pkg -->
<bundle.osgi.import.pkg>
javax.xml.bind;version="[2,3)",
javax.xml.bind.annotation;version="[2,3)",
@ -38,7 +42,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

2
system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java
View File

@ -106,7 +106,7 @@ public class PermissionServiceImpl implements PermissionService {
builder.equal(root.get("objectType"), type)),
builder.and(
builder.equal(root.get("subjectId"), String.valueOf(id)),
builder.equal(root.get("objectType"), type))));
builder.equal(root.get("subjectType"), type))));
return s.createQuery(criteriaQuery).getResultList();
}