|
@@ -17,6 +17,7 @@ import org.springframework.http.ResponseEntity;
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.util.Collection;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
@@ -87,7 +88,7 @@ public class FieldFilterDataAccessHandler implements DataAccessHandler {
|
|
|
|
|
|
@SuppressWarnings("all")
|
|
|
protected boolean doQueryAccess(FieldFilterDataAccessConfig access, AuthorizingContext context) {
|
|
|
- if (context.getDefinition().getPhased() == Phased.before) {
|
|
|
+ if (context.getDefinition().getDataAccessDefinition().getPhased() == Phased.before) {
|
|
|
QueryParamEntity entity = context.getParamContext().getParams()
|
|
|
.values().stream()
|
|
|
.filter(QueryParamEntity.class::isInstance)
|
|
@@ -97,7 +98,8 @@ public class FieldFilterDataAccessHandler implements DataAccessHandler {
|
|
|
logger.warn("try validate query access, but query entity is null or not instance of org.hswebframework.web.commons.entity.Entity");
|
|
|
return true;
|
|
|
}
|
|
|
- entity.excludes(access.getFields().toArray(new String[access.getFields().size()]));
|
|
|
+ Set<String> denyFields = access.getFields();
|
|
|
+ entity.excludes(denyFields.toArray(new String[denyFields.size()]));
|
|
|
} else {
|
|
|
Object result = InvokeResultUtils.convertRealResult(context.getParamContext().getInvokeResult());
|
|
|
if (result instanceof Collection) {
|