Merge pull request !20 from sunhan521/master

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisDefaultParameterHandler.java

@@ -155,21 +155,26 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
 
 	/**
 	 * <p>
-	 * 填充主键 ID
+	 * 自定义元对象填充控制器
 	 * </p>
-	 * 
+	 *
 	 * @param tableInfo
 	 * @param ms
-	 * @param parameterObject
-	 *            插入数据库对象
+	 * @param parameterObject 插入数据库对象
 	 * @return
 	 */
 	protected static Object populateKeys(TableInfo tableInfo, MappedStatement ms, Object parameterObject) {
-		if (null != tableInfo && StringUtils.isNotEmpty(tableInfo.getKeyProperty()) && null != tableInfo.getIdType()
-				&& tableInfo.getIdType().getKey() >= 2) {
-			MetaObject metaObject = ms.getConfiguration().newMetaObject(parameterObject);
+
+		if (null == tableInfo || StringUtils.isEmpty(tableInfo.getKeyProperty()) || null == tableInfo.getIdType()) {
+            /*
+             * 不处理
+             */
+			return parameterObject;
+		}
+		MetaObject metaObject = ms.getConfiguration().newMetaObject(parameterObject);
+		if (tableInfo.getIdType().getKey() >= 2) {
 			Object idValue = metaObject.getValue(tableInfo.getKeyProperty());
-			/* 自定义 ID */
+            /* 自定义 ID */
 			if (StringUtils.checkValNull(idValue)) {
 				if (tableInfo.getIdType() == IdType.ID_WORKER) {
 					metaObject.setValue(tableInfo.getKeyProperty(), IdWorker.getId());
@@ -177,17 +182,13 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
 					metaObject.setValue(tableInfo.getKeyProperty(), IdWorker.get32UUID());
 				}
 			}
-			/* 自定义元对象填充控制器 */
-			IMetaObjectHandler metaObjectHandler = GlobalConfiguration.getMetaObjectHandler(ms.getConfiguration());
-			if (null != metaObjectHandler) {
-				metaObjectHandler.insertFill(metaObject);
-			}
-			return metaObject.getOriginalObject();
 		}
-		/*
-		 * 不处理
-		 */
-		return parameterObject;
+        /* 自定义元对象填充控制器 */
+		IMetaObjectHandler metaObjectHandler = GlobalConfiguration.getMetaObjectHandler(ms.getConfiguration());
+		if (null != metaObjectHandler) {
+			metaObjectHandler.insertFill(metaObject);
+		}
+		return metaObject.getOriginalObject();
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })