update selectByMap

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -15,13 +15,13 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
-import com.baomidou.mybatisplus.MybatisConfiguration;
-import com.baomidou.mybatisplus.annotations.FieldStrategy;
-import com.baomidou.mybatisplus.annotations.IdType;
-import com.baomidou.mybatisplus.toolkit.SqlReservedWords;
-import com.baomidou.mybatisplus.toolkit.TableFieldInfo;
-import com.baomidou.mybatisplus.toolkit.TableInfo;
-import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
 import org.apache.ibatis.executor.keygen.KeyGenerator;
@@ -34,12 +34,13 @@ import org.apache.ibatis.scripting.LanguageDriver;
 import org.apache.ibatis.scripting.defaults.RawSqlSource;
 import org.apache.ibatis.session.Configuration;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
+import com.baomidou.mybatisplus.MybatisConfiguration;
+import com.baomidou.mybatisplus.annotations.FieldStrategy;
+import com.baomidou.mybatisplus.annotations.IdType;
+import com.baomidou.mybatisplus.toolkit.SqlReservedWords;
+import com.baomidou.mybatisplus.toolkit.TableFieldInfo;
+import com.baomidou.mybatisplus.toolkit.TableInfo;
+import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
 
 
 /**
@@ -538,14 +539,10 @@ public class AutoSqlInjector implements ISqlInjector {
 		where.append("\n<if test=\"cm!=null and !cm.isEmpty\">");
 		where.append("\n<where> ");
 		where.append("\n<foreach collection=\"cm.keys\" item=\"k\" separator=\"AND\"> ");
-		if (MybatisConfiguration.FIELD_STRATEGY == FieldStrategy.NOT_EMPTY){
-			where.append("\n<if test=\"cm[k] != null and cm[k] != ''\">");
-		}else{
-			where.append("\n<if test=\"cm[k] != null\">");
-		}
+		where.append("\n<if test=\"cm[k] != null\">");
 		if (DBType.MYSQL.equals(dbType)) {
 			where.append("\n`${k}` = #{cm[${k}]}");
-		}else{
+		} else {
 			where.append("\n${k} = #{cm[${k}]}");
 		}
 		where.append("\n</if>");

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/Wrapper.java

@@ -121,12 +121,12 @@ public abstract class Wrapper<T> implements Serializable {
      * @param params
      * @return
      */
-
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public Wrapper<T> allEq(Map<String, Object> params) {
         if (MapUtils.isNotEmpty(params)) {
-            Iterator iterator = params.entrySet().iterator();
+			Iterator iterator = params.entrySet().iterator();
             while (iterator.hasNext()) {
-                Map.Entry<String,Object> entry = (Map.Entry<String,Object>) iterator.next();
+				Map.Entry<String,Object> entry = (Map.Entry<String,Object>) iterator.next();
                 Object value = entry.getValue();
                 if(StringUtils.checkValNotNull(value)){
                     sql.WHERE(formatSql(String.format("%s = {0}", entry.getKey()), entry.getValue()));

mybatis-plus/src/main/java/com/baomidou/mybatisplus/plugins/SQLFormatter.java

@@ -365,8 +365,9 @@ public class SQLFormatter {
 
 	public static void main(String[] args) {
 		String sql = "select     *          from suber where id = '11  122'";
-        String format = new SQLFormatter().format(sql);
-        System.out.println(format);
-        System.out.println(format.replaceAll("([\\s]+(\"|'')?)", ""));
+		String format = new SQLFormatter().format(sql);
+		System.out.println(format);
+		System.out.println(format.replaceAll("([\\s]+(\"|'')?)", ""));
 	}
+
 }