diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/SpecialValueFunction.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/SpecialValueFunction.java index 121adc97..5ad85649 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/SpecialValueFunction.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/SpecialValueFunction.java @@ -80,7 +80,7 @@ public class SpecialValueFunction { * @param nullValue 为 null 或空字符串时返回值 * @return 空值处理后的值 */ - public static Object nil(Object value, Object nullValue) { + public static T nil(T value, T nullValue) { if(value==null) return nullValue; if(value instanceof String) { if(!StringUtils.hasText((String)value)){ @@ -97,13 +97,13 @@ public class SpecialValueFunction { * @param nanValue 不是一个数字时的返回值 * @return 非数字处理后的值 */ - public static Object nan(Object value, Object nanValue) { + public static T nan(T value, T nanValue) { if(value instanceof Float){ - if(Float.isNaN((float)value)){ + if(Float.isNaN((Float)value)){ return nanValue; } }else if(value instanceof Double){ - if(Double.isNaN((double)value)){ + if(Double.isNaN((Double)value)){ return nanValue; } } @@ -117,13 +117,13 @@ public class SpecialValueFunction { * @param infiniteValue 无穷时的返回值 * @return 无穷处理后的值 */ - public static Object infinite(Object value, Object infiniteValue) { + public static T infinite(T value, T infiniteValue) { if(value instanceof Float){ - if(Float.isInfinite((float)value)){ + if(Float.isInfinite((Float)value)){ return infiniteValue; } }else if(value instanceof Double){ - if(Double.isInfinite((double)value)){ + if(Double.isInfinite((Double)value)){ return infiniteValue; } } @@ -136,7 +136,7 @@ public class SpecialValueFunction { * @param zeroValue 为数值零时返回值 * @return 零值处理后的值 */ - public static Object zero(Object value, Object zeroValue) { + public static T zero(T value, T zeroValue) { if((value instanceof Number) && new BigDecimal(value.toString()).equals(BigDecimal.valueOf(0))){ return zeroValue; } diff --git a/io.sc.platform.core.frontend/src/platform/views/Home.vue b/io.sc.platform.core.frontend/src/platform/views/Home.vue index 48b090f1..75650219 100644 --- a/io.sc.platform.core.frontend/src/platform/views/Home.vue +++ b/io.sc.platform.core.frontend/src/platform/views/Home.vue @@ -6,14 +6,14 @@
-
+
-
+
diff --git a/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue b/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue index adf9c536..7bd28a77 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/Announcement.vue @@ -1,5 +1,6 @@