Browse Source

jfinal 3.2 release ^_^

James 8 years ago
parent
commit
38ca5996ce
1 changed files with 8 additions and 6 deletions
  1. 8 6
      src/main/java/com/jfinal/plugin/activerecord/dialect/Dialect.java

+ 8 - 6
src/main/java/com/jfinal/plugin/activerecord/dialect/Dialect.java

@@ -86,12 +86,14 @@ public abstract class Dialect {
 			if (model.get(pKey) == null || isOracle()) {
 				if (rs.next()) {
 					Class<?> colType = table.getColumnType(pKey);
-					if (colType == Integer.class || colType == int.class) {
-						model.set(pKey, rs.getInt(1));
-					} else if (colType == Long.class || colType == long.class) {
-						model.set(pKey, rs.getLong(1));
-					} else {
-						model.set(pKey, rs.getObject(1));		// It returns Long object for int colType
+					if (colType != null) {	// 支持没有主键的用法,有人将 model 改造成了支持无主键:济南-费小哥
+						if (colType == Integer.class || colType == int.class) {
+							model.set(pKey, rs.getInt(1));
+						} else if (colType == Long.class || colType == long.class) {
+							model.set(pKey, rs.getLong(1));
+						} else {
+							model.set(pKey, rs.getObject(1));		// It returns Long object for int colType
+						}
 					}
 				}
 			}