修复scope类型错误

zhergd · Aug 29, 2019 · bf2bd1e · bf2bd1e
1 parent 60e6d42
commit bf2bd1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...g/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java b/...g/hswebframework/web/organizational/authorization/simple/ScopeByUserDataAccessConfig.java
@@ -23,7 +23,7 @@ public class ScopeByUserDataAccessConfig extends AbstractDataAccessConfig implem
 
     private String scopeTypeName;
 
-    private Set<String> scope;
+    private Set<Object> scope;
 
     private boolean children;
 
@@ -42,8 +42,5 @@ public boolean equals(Object obj) {
         return obj instanceof ScopeByUserDataAccessConfig && obj.hashCode() == hashCode();
     }
 
-    public Set<Object> getScope(){
-        return ((Set) scope);
-    }
 
 }
diff --git a/...rg/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java b/...rg/hswebframework/web/organizational/authorization/simple/handler/ScopeByUserHandler.java
@@ -130,7 +130,7 @@ protected boolean doUpdateAccess(ScopeByUserDataAccessConfig config, Authorizing
     @SneakyThrows
     private ScopeInfo getScope(ScopeByUserDataAccessConfig config, PersonnelAuthentication authentication) {
         String termType = null, personTermType = "in";
-        Set<String> scope = null, allScope = null;
+        Set<?> scope = null, allScope = null;
         ScopeInfo scopeInfo = new ScopeInfo();
         if (authentication == null) {
             return scopeInfo;
@@ -226,8 +226,8 @@ class ScopeInfo {
         String termType;
         String personTermType;
 
-        List<String> scope;
-        List<String> allScope;
+        List<?> scope;
+        List<?> allScope;
 
         Consumer<Query<?, QueryParamEntity>> notUserConsumer;