Pārlūkot izejas kodu

andIf()更名为filterIf(),避免与and() andNew()产生歧义,名称也更简短明了。

yanghu 8 gadi atpakaļ
vecāks
revīzija
f44e31df4e

+ 14 - 14
mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java

@@ -135,19 +135,6 @@ public class EntityWrapper<T> {
         return where(sqlAnd, params);
         return where(sqlAnd, params);
     }
     }
 
 
-    /**
-     * <p>
-     * 动态判断是否需要添加条件语句
-     * </p>
-     *
-     * @param sqlAnd and条件语句
-     * @param params 参数集
-     * @return this
-     */
-    public EntityWrapper<T> andIf(boolean need, String sqlAnd, Object... params) {
-        return need ? where(sqlAnd, params) : this;
-    }
-
     /**
     /**
      * <p>
      * <p>
      * 使用AND连接并换行
      * 使用AND连接并换行
@@ -325,6 +312,19 @@ public class EntityWrapper<T> {
     }
     }
 
 
 
 
+    /**
+     * <p>
+     * 动态判断是否需要添加条件语句
+     * </p>
+     *
+     * @param sqlAnd and条件语句
+     * @param params 参数集
+     * @return this
+     */
+    public EntityWrapper<T> filterIf(boolean need, String sqlAnd, Object... params) {
+        return need ? where(sqlAnd, params) : this;
+    }
+
     /**
     /**
      * 为了兼容之前的版本,可使用where()或and()替代
      * 为了兼容之前的版本,可使用where()或and()替代
      *
      *
@@ -355,7 +355,7 @@ public class EntityWrapper<T> {
      */
      */
 //    @Deprecated
 //    @Deprecated
     public EntityWrapper<T> addFilterIfNeed(boolean need, String sqlWhere, Object... params) {
     public EntityWrapper<T> addFilterIfNeed(boolean need, String sqlWhere, Object... params) {
-        return andIf(need, sqlWhere, params);
+        return filterIf(need, sqlWhere, params);
     }
     }
 
 
     /**
     /**

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

@@ -85,7 +85,7 @@ public class EntityWrapperTest {
         /*
         /*
          * 无实体 where ifneed orderby
          * 无实体 where ifneed orderby
          */
          */
-        ew.where("name={0}", "'123'").addFilterIfNeed(false, "id=1").orderBy("id");
+        ew.where("name={0}", "'123'").filterIf(false, "id=1").orderBy("id");
         String sqlSegment = ew.getSqlSegment();
         String sqlSegment = ew.getSqlSegment();
         System.err.println("test21 = " + sqlSegment);
         System.err.println("test21 = " + sqlSegment);
         Assert.assertEquals("WHERE (name='123')\nORDER BY id", sqlSegment);
         Assert.assertEquals("WHERE (name='123')\nORDER BY id", sqlSegment);
@@ -127,7 +127,7 @@ public class EntityWrapperTest {
         /*
         /*
          * 非 T-SQL 无实体查询
          * 非 T-SQL 无实体查询
 		 */
 		 */
-        ew.addFilter("name={0}", "'123'").addFilterIfNeed(false, "status={1}", "1");
+        ew.addFilter("name={0}", "'123'").filterIf(false, "status={1}", "1");
         String sqlSegment = ew.getSqlSegment();
         String sqlSegment = ew.getSqlSegment();
         System.err.println("testNoTSQL1 = " + sqlSegment);
         System.err.println("testNoTSQL1 = " + sqlSegment);
         Assert.assertEquals("WHERE (name='123')", sqlSegment);
         Assert.assertEquals("WHERE (name='123')", sqlSegment);