diff --git a/server/core/null_int.go b/server/core/null_int.go
index 07b8b1f..6026067 100644
--- a/server/core/null_int.go
+++ b/server/core/null_int.go
@@ -17,7 +17,18 @@ func EncodeInt(value any) any {
 	switch v := value.(type) {
 	case map[string]any:
 		if v["Int"] != nil {
-			return v["Int"]
+			val := v["Int"]
+			switch i := val.(type) {
+			case *int:
+				return *i
+			case *int64:
+				return *i
+			case *string:
+				return *i
+			default:
+				return ""
+			}
+			// return val
 		}
 	}
 	return ""
diff --git a/server/util/null_time.go b/server/util/null_time.go
index bf3b703..455ca2f 100644
--- a/server/util/null_time.go
+++ b/server/util/null_time.go
@@ -27,10 +27,20 @@ func (t nullTimeUtil) EncodeTime(value any) any {
 	var str = ""
 	switch v := value.(type) {
 	case map[string]interface{}:
-		tt := v["Time"]
+		val := v["Time"]
+		switch tt := val.(type) {
+		case *string:
+			ttt, _ := t.Parse(*tt)
+			str = ttt.String()
+		case *time.Time:
+			if tt != nil {
+				ttt, _ := t.Parse(*tt)
+				str = ttt.String()
+			} else {
+				str = ""
+			}
+		}
 
-		ttt, _ := t.Parse(tt)
-		str = ttt.String()
 	}
 	return str
 }