chakra-coder
diff --git a/‎src/main/java/com/isea533/mybatis/controller/demo/DemoController.java
Lines changed: 2 additions & 3 deletions b/‎src/main/java/com/isea533/mybatis/controller/demo/DemoController.java
Lines changed: 2 additions & 3 deletions
diff --git a/‎src/main/java/com/isea533/mybatis/mapperhelper/EntityHelper.java
Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/isea533/mybatis/mapperhelper/EntityHelper.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/isea533/mybatis/mapperhelper/Mapper.java
Lines changed: 9 additions & 9 deletions b/‎src/main/java/com/isea533/mybatis/mapperhelper/Mapper.java
Lines changed: 9 additions & 9 deletions
@@ -1,7 +1,6 @@
 package com.isea533.mybatis.controller.demo;
 
 import com.isea533.mybatis.model.Country;
-import com.isea533.mybatis.model.Country2;
 import com.isea533.mybatis.service.DemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -41,10 +40,10 @@ public ResponseEntity<Country> requestTest6() {
 
     @ResponseBody
     @RequestMapping("test3")
-    public List<Country2> requestTest7(
+    public List<Country> requestTest7(
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") int pageNum,
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize
     ) {
-        return demoService.selectPage2(pageNum, pageSize);
+        return demoService.selectPage(pageNum, pageSize);
     }
 }
@@ -215,7 +215,7 @@ public static String getPrimaryKeyWhere(Class<?> entityClass) {
         List<EntityColumn> entityColumns = EntityHelper.getPKColumns(entityClass);
         StringBuilder whereBuilder = new StringBuilder();
         for (EntityHelper.EntityColumn column : entityColumns) {
-            whereBuilder.append(column.getColumn()).append(" = ?").append(" and ");
+            whereBuilder.append(column.getColumn()).append(" = ?").append(" AND ");
         }
         return whereBuilder.substring(0, whereBuilder.length() - 4);
     }
 
@@ -40,31 +40,31 @@ of this software and associated documentation files (the "Software"), to deal
  */
 public interface Mapper<T> {
 
-    @SelectProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @SelectProvider(type = MapperProvider.class, method = "dynamicSQL")
     List<T> select(T record);
 
-    @SelectProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @SelectProvider(type = MapperProvider.class, method = "dynamicSQL")
     int selectCount(T record);
 
-    @SelectProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @SelectProvider(type = MapperProvider.class, method = "dynamicSQL")
     T selectByPrimaryKey(Object key);
 
-    @InsertProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @InsertProvider(type = MapperProvider.class, method = "dynamicSQL")
     int insert(T record);
 
-    @InsertProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @InsertProvider(type = MapperProvider.class, method = "dynamicSQL")
     int insertSelective(T record);
 
-    @DeleteProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @DeleteProvider(type = MapperProvider.class, method = "dynamicSQL")
     int delete(T key);
 
-    @DeleteProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @DeleteProvider(type = MapperProvider.class, method = "dynamicSQL")
     int deleteByPrimaryKey(Object key);
 
-    @UpdateProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @UpdateProvider(type = MapperProvider.class, method = "dynamicSQL")
     int updateByPrimaryKey(T record);
 
-    @UpdateProvider(type = MapperHelper.class, method = MapperHelper.DYNAMIC_SQL)
+    @UpdateProvider(type = MapperProvider.class, method = "dynamicSQL")
     int updateByPrimaryKeySelective(T record);
 
 }
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public static String getPrimaryKeyWhere(Class<?> entityClass) {`
`215`	`215`	`List<EntityColumn> entityColumns = EntityHelper.getPKColumns(entityClass);`
`216`	`216`	`StringBuilder whereBuilder = new StringBuilder();`
`217`	`217`	`for (EntityHelper.EntityColumn column : entityColumns) {`
`218`		`- whereBuilder.append(column.getColumn()).append(" = ?").append(" and ");`
	`218`	`+ whereBuilder.append(column.getColumn()).append(" = ?").append(" AND ");`
`219`	`219`	`}`
`220`	`220`	`return whereBuilder.substring(0, whereBuilder.length() - 4);`
`221`	`221`	`}`