解决Example查询in,notin无效的bug#24

Author: abel533

src/main/java/com/github/abel533/mapperhelper/MapperTemplate.java

@@ -457,18 +457,18 @@ protected void newSelectKeyMappedStatement(MappedStatement ms, EntityHelper.Enti
 
     public IfSqlNode ExampleValidSqlNode(Configuration configuration) {
         List<SqlNode> whenSqlNodes = new ArrayList<SqlNode>();
-        IfSqlNode noValueSqlNode = new IfSqlNode(new TextSqlNode(" and ${criterion.condition}"), "criterion.noValue");
+        IfSqlNode noValueSqlNode = new IfSqlNode(new TextSqlNode("and ${criterion.condition}"), "criterion.noValue");
         whenSqlNodes.add(noValueSqlNode);
-        IfSqlNode singleValueSqlNode = new IfSqlNode(new TextSqlNode(" and ${criterion.condition} #{criterion.value}"), "criterion.singleValue");
+        IfSqlNode singleValueSqlNode = new IfSqlNode(new TextSqlNode("and ${criterion.condition} #{criterion.value}"), "criterion.singleValue");
         whenSqlNodes.add(singleValueSqlNode);
-        IfSqlNode betweenValueSqlNode = new IfSqlNode(new TextSqlNode(" and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}"), "criterion.betweenValue");
+        IfSqlNode betweenValueSqlNode = new IfSqlNode(new TextSqlNode("and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}"), "criterion.betweenValue");
         whenSqlNodes.add(betweenValueSqlNode);
 
         List<SqlNode> listValueContentSqlNodes = new ArrayList<SqlNode>();
-        listValueContentSqlNodes.add(new TextSqlNode(" and ${criterion.condition}"));
+        listValueContentSqlNodes.add(new TextSqlNode("and ${criterion.condition}"));
         ForEachSqlNode listValueForEachSqlNode = new ForEachSqlNode(configuration, new StaticTextSqlNode("#{listItem}"), "criterion.value", null, "listItem", "(", ")", ",");
         listValueContentSqlNodes.add(listValueForEachSqlNode);
-        IfSqlNode listValueSqlNode = new IfSqlNode(new MixedSqlNode(listValueContentSqlNodes), "criterion.noValue");
+        IfSqlNode listValueSqlNode = new IfSqlNode(new MixedSqlNode(listValueContentSqlNodes), "criterion.listValue");
         whenSqlNodes.add(listValueSqlNode);
 
         ChooseSqlNode chooseSqlNode = new ChooseSqlNode(whenSqlNodes, null);

src/test/java/com/github/abel533/entity/test/TestExample.java

@@ -33,6 +33,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -115,6 +116,24 @@ public void testSelectByExample() {
         }
     }
 
+    @Test
+    public void testSelectByExampleInNotIn() {
+        SqlSession sqlSession = MybatisHelper.getSqlSession();
+        try {
+            CommonMapper commonMapper = sqlSession.getMapper(CommonMapper.class);
+            EntityMapper entityMapper = new EntityMapper(commonMapper);
+
+            Example example = new Example(Country.class);
+            example.createCriteria().andIn("id", Arrays.asList(new Object[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}))
+                    .andNotIn("id", Arrays.asList(new Object[]{11}));
+            List<Country> countries = entityMapper.selectByExample(example);
+            //查询总数
+            Assert.assertEquals(10, countries.size());
+        } finally {
+            sqlSession.close();
+        }
+    }
+
     @Test
     public void testUpdateByExampleSelective() {
         SqlSession sqlSession = MybatisHelper.getSqlSession();

src/test/java/com/github/abel533/test/example/TestSelectByExample.java

@@ -9,6 +9,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -32,6 +33,22 @@ public void testSelectByExample() {
         }
     }
 
+    @Test
+    public void testSelectByExampleInNotIn() {
+        SqlSession sqlSession = MybatisHelper.getSqlSession();
+        try {
+            CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
+            Example example = new Example(Country.class);
+            example.createCriteria().andIn("id", Arrays.asList(new Object[]{1,2,3,4,5,6,7,8,9,10,11}))
+                    .andNotIn("id", Arrays.asList(new Object[]{11}));
+            List<Country> countries = mapper.selectByExample(example);
+            //查询总数
+            Assert.assertEquals(10, countries.size());
+        } finally {
+            sqlSession.close();
+        }
+    }
+
     @Test
     public void testSelectByExample2() {
         SqlSession sqlSession = MybatisHelper.getSqlSession();