优化调整

src/main/java/com/baomidou/mybatisplus/MybatisDefaultParameterHandler.java

@@ -103,8 +103,8 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
      * @return
      */
     protected static Object processBatch(MappedStatement ms, Object parameterObject) {
-	//检查parameterObject
-	if (null == parameterObject) return null;
+        //检查parameterObject
+        if (null == parameterObject) return null;
         boolean isFill = false;
         // 全局配置是否配置填充器
         MetaObjectHandler metaObjectHandler = GlobalConfigUtils.getMetaObjectHandler(ms.getConfiguration());
@@ -132,18 +132,14 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
                 }
                 return objList;
             } else {
-                TableInfo tableInfo;
-                if (parameterObject instanceof java.util.Map) {
-                    Map map = (java.util.Map) parameterObject;
-                    if(map.containsKey("et")){
+                TableInfo tableInfo = null;
+                if (parameterObject instanceof Map) {
+                    Map map = (Map) parameterObject;
+                    if (map.containsKey("et")) {
                         Object et = map.get("et");
                         if (et != null) {
                             tableInfo = TableInfoHelper.getTableInfo(et.getClass());
-                        } else {
-                            tableInfo = null;
                         }
-                    }else{
-                        tableInfo = null;
                     }
                 } else {
                     tableInfo = TableInfoHelper.getTableInfo(parameterObject.getClass());

src/main/java/com/baomidou/mybatisplus/entity/TableInfo.java

@@ -204,9 +204,6 @@ public class TableInfo {
     }
 
     public void setLogicDelete(boolean logicDelete) {
-        if (logicDelete) {
-            // 非 true 不设置，默认 false
-            this.logicDelete = logicDelete;
-        }
+        this.logicDelete = logicDelete;
     }
 }

src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -182,7 +182,7 @@ public class AutoGenerator {
             if (config.getStrategyConfig().isEntityBooleanColumnRemoveIsPrefix()) {
                 for (TableField field : tableInfo.getFields()) {
                     if (field.getPropertyType().equalsIgnoreCase("boolean")) {
-                        if (field.getPropertyName().indexOf("is") != -1) {
+                        if (field.getPropertyName().contains("is")) {
                             field.setPropertyName(config.getStrategyConfig(),
                                     field.getPropertyName().substring(0, 3).toLowerCase().substring(2));
                         }

src/main/java/com/baomidou/mybatisplus/generator/config/po/TableField.java

@@ -15,7 +15,6 @@
  */
 package com.baomidou.mybatisplus.generator.config.po;
 
-import com.baomidou.mybatisplus.enums.FieldIgnore;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
 import com.baomidou.mybatisplus.toolkit.StringUtils;

src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -239,16 +239,12 @@ public class AutoSqlInjector implements ISqlInjector {
         }
 
         // 是否 IF 标签判断
-        boolean ifTag = true;
+        boolean ifTag;
         List<TableFieldInfo> fieldList = table.getFieldList();
         for (TableFieldInfo fieldInfo : fieldList) {
-            /* 判断是否插入忽略 */
-            if (FieldIgnore.INSERT == fieldInfo.getFieldIgnore()
-                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore()) {
-                ifTag = false;
-            } else {
-                ifTag = true;
-            }
+            // 在FieldIgnore,INSERT_UPDATE,INSERT 时设置为false
+            ifTag = !(FieldIgnore.INSERT == fieldInfo.getFieldIgnore()
+                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore());
             if (selective && ifTag) {
                 fieldBuilder.append(convertIfTagIgnored(fieldInfo, false));
                 fieldBuilder.append(fieldInfo.getColumn()).append(",");
@@ -541,16 +537,12 @@ public class AutoSqlInjector implements ISqlInjector {
         set.append("<trim prefix=\"SET\" suffixOverrides=\",\">");
 
         // 是否 IF 标签判断
-        boolean ifTag = true;
+        boolean ifTag;
         List<TableFieldInfo> fieldList = table.getFieldList();
         for (TableFieldInfo fieldInfo : fieldList) {
-            /* 判断是否更新忽略 */
-            if (FieldIgnore.UPDATE == fieldInfo.getFieldIgnore()
-                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore()) {
-                ifTag = false;
-            } else {
-                ifTag = true;
-            }
+            // 判断是否更新忽略,在FieldIgnore,UPDATE,INSERT_UPDATE设置为false
+            ifTag = !(FieldIgnore.UPDATE == fieldInfo.getFieldIgnore()
+                    || FieldIgnore.INSERT_UPDATE == fieldInfo.getFieldIgnore());
             if (selective && ifTag) {
                 set.append(convertIfTag(true, fieldInfo, prefix, false));
                 set.append(fieldInfo.getColumn()).append("=#{");

src/main/java/com/baomidou/mybatisplus/plugins/pagination/PageHelper.java

@@ -16,7 +16,6 @@
 package com.baomidou.mybatisplus.plugins.pagination;
 
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 
 /**
  * <p>
@@ -89,7 +88,7 @@ public class PageHelper {
      * @return
      */
     public static boolean isPageable() {
-        return LOCAL_PAGE.get() != null ? true : false;
+        return LOCAL_PAGE.get() != null;
     }
 
     /**

src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.enums.FieldIgnore;

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserMetaObj.java

@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 import com.baomidou.mybatisplus.enums.FieldIgnore;
-import com.baomidou.mybatisplus.enums.FieldStrategy;
 import com.baomidou.mybatisplus.enums.IdType;
 
 import lombok.Data;

src/test/java/com/baomidou/mybatisplus/test/mysql/entity/User.java

@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.annotations.TableLogic;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 import com.baomidou.mybatisplus.enums.FieldIgnore;
-import com.baomidou.mybatisplus.enums.FieldStrategy;
 
 /**
  * <p>