Browse Source

Merge remote-tracking branch 'github/master'

jobob 8 years ago
parent
commit
6054ad7a3f

+ 2 - 0
src/main/java/com/baomidou/mybatisplus/MybatisDefaultParameterHandler.java

@@ -103,6 +103,8 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
      * @return
      * @return
      */
      */
     protected static Object processBatch(MappedStatement ms, Object parameterObject) {
     protected static Object processBatch(MappedStatement ms, Object parameterObject) {
+	//检查parameterObject
+	if (null == parameterObject) return null;
         boolean isFill = false;
         boolean isFill = false;
         // 全局配置是否配置填充器
         // 全局配置是否配置填充器
         MetaObjectHandler metaObjectHandler = GlobalConfigUtils.getMetaObjectHandler(ms.getConfiguration());
         MetaObjectHandler metaObjectHandler = GlobalConfigUtils.getMetaObjectHandler(ms.getConfiguration());