github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-06-29 07:11:38 +08:00
Code Issues Releases Wiki Activity

Release version 5.1.0, fix permission not load in real time

Browse Source
This commit is contained in:
Hai Liang Wang 2019-12-27 15:47:22 +08:00
parent 7a402bad40
commit 7c5b7bcc39
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contact-center/app/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.chatopera.cc</groupId> <groupId>com.chatopera.cc</groupId>
<artifactId>contact-center</artifactId> <artifactId>contact-center</artifactId>
<version>5.0.0</version> <version>5.1.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>cskefu</name> <name>cskefu</name>
<description>春松客服：多渠道智能客服系统</description> <description>春松客服：多渠道智能客服系统</description>

10
contact-center/app/src/main/java/com/chatopera/cc/proxy/UserProxy.java
View File

@ -478,18 +478,20 @@ public class UserProxy {
public Predicate toPredicate( public Predicate toPredicate(
Root<RoleAuth> root, CriteriaQuery<?> query, Root<RoleAuth> root, CriteriaQuery<?> query,
CriteriaBuilder cb) { CriteriaBuilder cb) {
List<Predicate> list = new ArrayList<Predicate>(); List<Predicate> criteria = new ArrayList<Predicate>();
if (user.getRoleList() != null && user.getRoleList().size() > 0) { if (user.getRoleList() != null && user.getRoleList().size() > 0) {
for (Role role : user.getRoleList()) { for (Role role : user.getRoleList()) {
list.add(cb.equal(root.get("roleid").as(String.class), role.getId())); criteria.add(cb.equal(root.get("roleid").as(String.class), role.getId()));
} }
} }
Predicate[] p = new Predicate[list.size()]; Predicate[] p = new Predicate[criteria.size()];
cb.and(cb.equal(root.get("orgi").as(String.class), user.getOrgi())); cb.and(cb.equal(root.get("orgi").as(String.class), user.getOrgi()));
return cb.or(list.toArray(p)); return cb.or(criteria.toArray(p));
} }
}); });
// clear previous auth map values, ensure the changes are token effect in real time.
user.getRoleAuthMap().clear();
if (roleAuthList != null) { if (roleAuthList != null) {
for (RoleAuth roleAuth : roleAuthList) { for (RoleAuth roleAuth : roleAuthList) {
user.getRoleAuthMap().put(roleAuth.getDicvalue(), true); user.getRoleAuthMap().put(roleAuth.getDicvalue(), true);