增加空指针判断

entropy-cloud · Aug 15, 2024 · 636c8da · 636c8da
1 parent 6cffad1
commit 636c8da
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
@@ -3175,6 +3175,12 @@
           "java.util.function.Function"
         ]
       },
+      {
+        "name": "fromJavaClass",
+        "parameterTypes": [
+          "java.lang.Class"
+        ]
+      },
       {
         "name": "fromJdbcType",
         "parameterTypes": [
@@ -19113,6 +19119,10 @@
         "name": "getColumns",
         "parameterTypes": []
       },
+      {
+        "name": "getJavaClass",
+        "parameterTypes": []
+      },
       {
         "name": "getKind",
         "parameterTypes": []
@@ -19151,6 +19161,12 @@
           "java.util.List"
         ]
       },
+      {
+        "name": "setJavaClass",
+        "parameterTypes": [
+          "java.lang.Class"
+        ]
+      },
       {
         "name": "setOwnerEntityModel",
         "parameterTypes": [
@@ -23001,6 +23017,14 @@
         "name": "getExpandValue",
         "parameterTypes": []
       },
+      {
+        "name": "getExpandableColParent",
+        "parameterTypes": []
+      },
+      {
+        "name": "getExpandableRowParent",
+        "parameterTypes": []
+      },
       {
         "name": "getExportValue",
         "parameterTypes": []
@@ -23031,6 +23055,10 @@
         "name": "getImage",
         "parameterTypes": []
       },
+      {
+        "name": "getLayerCoordinate",
+        "parameterTypes": []
+      },
       {
         "name": "getLinkUrl",
         "parameterTypes": []
@@ -23105,6 +23133,10 @@
         "name": "getRr",
         "parameterTypes": []
       },
+      {
+        "name": "getSheet",
+        "parameterTypes": []
+      },
       {
         "name": "getStyleId",
         "parameterTypes": []

diff --git a/nop-orm-model/src/main/java/io/nop/orm/model/OrmColumnModel.java b/nop-orm-model/src/main/java/io/nop/orm/model/OrmColumnModel.java
@@ -92,8 +92,11 @@ public void setColumnRefs(List<IEntityRelationModel> columnRefs) {
 
     @Override
     public Class<?> getJavaClass() {
-        if (javaClass == null)
+        if (javaClass == null) {
+            if (getStdDataType() == null)
+                return null;
             return getStdDataType().getJavaClass();
+        }
         return javaClass;
     }