3.3.8

abel533 · abel533 · commit 0ccf4daa9e49 · 2016-03-23T23:04:34.000+08:00
diff --git a/README.md b/README.md
@@ -108,11 +108,15 @@ http://repo1.maven.org/maven2/javax/persistence/persistence-api/1.0/
 
 ##[更新日志](http://git.oschina.net/free/Mapper/blob/master/wiki/Changelog.md)
 
-##3.3.8-SNAPSHOT - 2016-03-19
+##最新版本3.3.8 - 2016-03-23
 
+* `Example`的`andIn`和`andNotIn`方法参数改为`Collection` #109
 * 解决ResultMapping.Builder3.2.6版本新增`lazy`方法导致无法兼容3.2.4~3.2.5版本的问题，仍然兼容3.2.4+
+* 解决github[#12](https://github.com/abel533/Mapper/issues/12) 问题
+* 解决#107
+* 解决和分页插件PageHelper中orderBy默认属性名相同导致排序的错误
 
-##最新版本3.3.7 - 2016-03-12
+###3.3.7 - 2016-03-12
 
 * `Example`增加`orderBy`方法，使用属性进行排序，例如：`example.orderBy("id").desc().orderBy("countryname").orderBy("countrycode").asc();`
 * 当实体类包含数组类型的字段时，在`resultMap`中不使用`javaType`，这种情况如果出错，可以通过`@ColumnType`注解设置`jdbcType` #103
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>tk.mybatis</groupId>
     <artifactId>mapper</artifactId>
-    <version>3.3.8-SNAPSHOT</version>
+    <version>3.3.8</version>
     <packaging>jar</packaging>
 
     <name>mapper</name>
diff --git a/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java b/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java
@@ -34,9 +34,7 @@
 import tk.mybatis.mapper.mapper.MybatisHelper;
 import tk.mybatis.mapper.model.Country;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author liuzh
@@ -79,6 +77,24 @@ public void testAndExample() {
 
     @Test
     public void testSelectByExampleInNotIn() {
+        SqlSession sqlSession = MybatisHelper.getSqlSession();
+        try {
+            CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
+            Example example = new Example(Country.class);
+            Set<Integer> set = new HashSet<Integer>();
+            set.addAll(Arrays.asList(new Integer[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}));
+            example.createCriteria().andIn("id", set)
+                    .andNotIn("id", Arrays.asList(new Object[]{11}));
+            List<Country> countries = mapper.selectByExample(example);
+            //查询总数
+            Assert.assertEquals(10, countries.size());
+        } finally {
+            sqlSession.close();
+        }
+    }
+
+    @Test
+    public void testSelectByExampleInNotIn2() {
         SqlSession sqlSession = MybatisHelper.getSqlSession();
         try {
             CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -1,5 +1,13 @@
 #更新日志
 
+##3.3.8 - 2016-03-23
+
+* `Example`的`andIn`和`andNotIn`方法参数改为`Collection` #109
+* 解决ResultMapping.Builder3.2.6版本新增`lazy`方法导致无法兼容3.2.4~3.2.5版本的问题，仍然兼容3.2.4+
+* 解决github[#12](https://github.com/abel533/Mapper/issues/12) 问题
+* 解决#107
+* 解决和分页插件PageHelper中orderBy默认属性名相同导致排序的错误
+
 ##3.3.7 - 2016-03-12
 
 * `Example`增加`orderBy`方法，使用属性进行排序，例如：`example.orderBy("id").desc().orderBy("countryname").orderBy("countrycode").asc();`
