diff --git a/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java
index 5cc6b3d4..2b9b89ac 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/BaseTypeKeyMapCodec.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 基础类型作为key的map解析器
+ * 基础类型作为key的map解析器 (key 默认不能为null)
  * @Author：lqh
  * @Date：2024/6/17 13:55
  */
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java
index 63197040..832df574 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/BooleanMapCodec.java
@@ -17,7 +17,7 @@ public class BooleanMapCodec implements MapKeyCodec<Boolean> {
     @Override
     public Boolean decode(String text) {
         if (text == null) {
-            return null;
+            throw new java.lang.NullPointerException();
         } else if (isValidName(true, text)) {
             return true;
         } else if (isValidName(false, text)) {
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java
index b0554bd9..fe234e76 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/ByteMapCodec.java
@@ -10,9 +10,7 @@ import com.zfoo.orm.codec.MapKeyCodec;
 public class ByteMapCodec implements MapKeyCodec<Byte> {
     @Override
     public String encode(Byte value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java
index fe6f197a..58bfc72c 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/CharacterMapCodec.java
@@ -11,9 +11,7 @@ import org.springframework.util.StringUtils;
 public class CharacterMapCodec implements MapKeyCodec<Character> {
     @Override
     public String encode(Character value) {
-        return (value != null)
-                ? value.toString()
-                : "";
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java
index 9661ac4a..a39b8f6b 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/DoubleMapCodec.java
@@ -10,9 +10,7 @@ public class DoubleMapCodec implements MapKeyCodec<Double> {
 
     @Override
     public String encode(Double value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java
index 5996ba80..089900ad 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/FloatMapCodec.java
@@ -10,9 +10,7 @@ public class FloatMapCodec implements MapKeyCodec<Float> {
 
     @Override
     public String encode(Float value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java
index dcfab09d..2e9e8a6e 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/IntMapCodec.java
@@ -13,9 +13,7 @@ public class IntMapCodec implements MapKeyCodec<Integer> {
 
     @Override
     public String encode(Integer value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java
index 950995f7..be15c9a5 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/LongMapCodec.java
@@ -13,9 +13,7 @@ public class LongMapCodec implements MapKeyCodec<Long> {
 
     @Override
     public String encode(Long value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override
diff --git a/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java b/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java
index aa154dd9..cbf5c6e2 100644
--- a/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java
+++ b/orm/src/main/java/com/zfoo/orm/codec/basetype/ShortMapCodec.java
@@ -9,9 +9,7 @@ import com.zfoo.orm.codec.MapKeyCodec;
 public class ShortMapCodec implements MapKeyCodec<Short> {
     @Override
     public String encode(Short value) {
-        return (value != null)
-                ? value.toString()
-                : null;
+        return value.toString();
     }
 
     @Override