From 6615326edb60254f91953fc52cef9b60c910a9e3 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 7 Dec 2023 22:06:37 +0800
Subject: [PATCH] =?UTF-8?q?EntityCache=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/redkale/source/EntityCache.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/redkale/source/EntityCache.java b/src/main/java/org/redkale/source/EntityCache.java
index 3c63171c7..0110772d1 100644
--- a/src/main/java/org/redkale/source/EntityCache.java
+++ b/src/main/java/org/redkale/source/EntityCache.java
@@ -80,8 +80,8 @@ public final class EntityCache<T> {
 
     private CompletableFuture<List<T>> loadFuture;
 
-    public EntityCache(final EntityInfo<T> info, final Cacheable c) {
-        this(info, c != null ? c.interval() : 0, c != null && c.direct());
+    public EntityCache(final EntityInfo<T> info, final Entity c) {
+        this(info, c != null && c.cacheable() ? c.cacheInterval() : 0, c != null && c.cacheable() && c.cacheDirect());
     }
 
     EntityCache(final EntityInfo<T> info, final int cacheInterval, final boolean cacheDirect) {
@@ -163,7 +163,7 @@ public final class EntityCache<T> {
                 t.setDaemon(true);
                 return t;
             });
-            this.scheduler.setRemoveOnCancelPolicy(true); 
+            this.scheduler.setRemoveOnCancelPolicy(true);
             this.scheduler.scheduleAtFixedRate(() -> {
                 try {
                     ConcurrentHashMap newmap2 = new ConcurrentHashMap();
@@ -1077,7 +1077,7 @@ public final class EntityCache<T> {
         if (node.getExpress() == ColumnExpress.SET) {
             return leftVal;
         }
-        
+
         Serializable rightVal = null;
         ColumnNode rightNode = node.getRight();
         //类型只能是ColumnNameNode、ColumnNumberNode、ColumnExpNode