From 79dce348a2316d4e3ad65f3237b3f86d0119d6ce Mon Sep 17 00:00:00 2001
From: zhou-hao <i@hsweb.me>
Date: Thu, 3 May 2018 22:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0and=20=E5=92=8Cor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hswebframework/web/authorization/Permission.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/Permission.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/Permission.java
index e0f85c0a5..403c08a42 100644
--- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/Permission.java
+++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/Permission.java
@@ -188,6 +188,17 @@ public interface Permission extends Serializable {
      */
     interface DataAccessPredicate<T extends DataAccessConfig> extends Predicate<DataAccessConfig> {
         boolean test(DataAccessConfig config);
+
+
+        @Override
+        default DataAccessPredicate<T> and(Predicate<? super DataAccessConfig> other) {
+            return (t) -> test(t) && other.test(t);
+        }
+
+        @Override
+        default DataAccessPredicate<T> or(Predicate<? super DataAccessConfig> other) {
+            return (t) -> test(t) || other.test(t);
+        }
     }
 
 }