Release version 5.1.0, fix permission not load in real time

cskefu · Dec 27, 2019 · 7c5b7bc · 7c5b7bc
1 parent 7a402ba
commit 7c5b7bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/contact-center/app/pom.xml b/contact-center/app/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.chatopera.cc</groupId>
     <artifactId>contact-center</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
     <packaging>war</packaging>
     <name>cskefu</name>
     <description>春松客服：多渠道智能客服系统</description>

diff --git a/contact-center/app/src/main/java/com/chatopera/cc/proxy/UserProxy.java b/contact-center/app/src/main/java/com/chatopera/cc/proxy/UserProxy.java
@@ -478,18 +478,20 @@ public void attachRolesMap(final User user) {
             public Predicate toPredicate(
                     Root<RoleAuth> root, CriteriaQuery<?> query,
                     CriteriaBuilder cb) {
-                List<Predicate> list = new ArrayList<Predicate>();
+                List<Predicate> criteria = new ArrayList<Predicate>();
                 if (user.getRoleList() != null && user.getRoleList().size() > 0) {
                     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()));
-                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) {
             for (RoleAuth roleAuth : roleAuthList) {
                 user.getRoleAuthMap().put(roleAuth.getDicvalue(), true);