From 7e55dcc46d2c8023ad7ac590ddd228bfac96d1c2 Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Wed, 11 Dec 2019 19:01:45 +0800 Subject: [PATCH] =?UTF-8?q?FilterNode=E5=85=BC=E5=AE=B9String=E7=9A=84=20>?= =?UTF-8?q?=3D=20>=20<=20<=3D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/redkale/source/FilterNode.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/redkale/source/FilterNode.java b/src/org/redkale/source/FilterNode.java index 15a319233..72fb62788 100644 --- a/src/org/redkale/source/FilterNode.java +++ b/src/org/redkale/source/FilterNode.java @@ -884,7 +884,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() > ((Number) fkattr.get(t)).longValue(); + return ((Comparable) attr.get(t)).compareTo((Comparable) fkattr.get(t)) > 0; } @Override @@ -895,7 +895,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() > ((Number) val).longValue(); + return ((Comparable) attr.get(t)).compareTo(((Comparable) val)) > 0; } @Override @@ -908,7 +908,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() < ((Number) fkattr.get(t)).longValue(); + return ((Comparable) attr.get(t)).compareTo((Comparable) fkattr.get(t)) < 0; } @Override @@ -919,7 +919,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() < ((Number) val).longValue(); + return ((Comparable) attr.get(t)).compareTo(((Comparable) val)) < 0; } @Override @@ -932,7 +932,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() >= ((Number) fkattr.get(t)).longValue(); + return ((Comparable) attr.get(t)).compareTo((Comparable) fkattr.get(t)) >= 0; } @Override @@ -943,7 +943,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() >= ((Number) val).longValue(); + return ((Comparable) attr.get(t)).compareTo(((Comparable) val)) >= 0; } @Override @@ -956,7 +956,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() <= ((Number) fkattr.get(t)).longValue(); + return ((Comparable) attr.get(t)).compareTo((Comparable) fkattr.get(t)) <= 0; } @Override @@ -967,7 +967,7 @@ public class FilterNode { //FilterNode 不能实现Serializable接口, 否则 @Override public boolean test(T t) { - return ((Number) attr.get(t)).longValue() <= ((Number) val).longValue(); + return ((Comparable) attr.get(t)).compareTo(((Comparable) val)) <= 0; } @Override