diff --git a/server/lib/tigon b/server/lib/tigon
index 97b1da4..5991f36 160000
--- a/server/lib/tigon
+++ b/server/lib/tigon
@@ -1 +1 @@
-Subproject commit 97b1da4c89ac3e2919a111fef058b8a69de3c27b
+Subproject commit 5991f36ae60c1f7ed818f36f501c440bef527667
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthFailedLogMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthFailedLogMapperTest.java
index 8d4cca0..ed7bc5a 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthFailedLogMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthFailedLogMapperTest.java
@@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Test;
import java.util.Date;
import org.junit.Assert;
@@ -34,7 +35,7 @@ public class AuthFailedLogMapperTest extends AbstractTransactionalJUnit4SpringCo
m.setUserAgent("s");
m.setExt("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
AuthFailedLog m1 = mapper.find(id);
@@ -63,7 +64,7 @@ public class AuthFailedLogMapperTest extends AbstractTransactionalJUnit4SpringCo
Assert.assertEquals("S", m.getUserAgent());
Assert.assertEquals("S", m.getExt());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthLogMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthLogMapperTest.java
index 73c9f53..7ad6835 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthLogMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/AuthLogMapperTest.java
@@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Test;
import java.util.Date;
import org.junit.Assert;
@@ -33,7 +34,7 @@ public class AuthLogMapperTest extends AbstractTransactionalJUnit4SpringContextT
m.setIp("s");
m.setExt("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
AuthLog m1 = mapper.find(id);
@@ -59,7 +60,7 @@ public class AuthLogMapperTest extends AbstractTransactionalJUnit4SpringContextT
Assert.assertEquals("S", m.getIp());
Assert.assertEquals("S", m.getExt());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerApplicationMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerApplicationMapperTest.java
index 26a5da2..daa6964 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerApplicationMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerApplicationMapperTest.java
@@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Test;
import java.util.Date;
import org.junit.Assert;
@@ -33,7 +34,7 @@ public class CustomerApplicationMapperTest extends AbstractTransactionalJUnit4Sp
m.setCustomerId("s");
m.setApplicationId("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
CustomerApplication m1 = mapper.find(id);
@@ -53,7 +54,7 @@ public class CustomerApplicationMapperTest extends AbstractTransactionalJUnit4Sp
Assert.assertEquals("S", m.getCustomerId());
Assert.assertEquals("S", m.getPropertyId());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerIssueMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerIssueMapperTest.java
index 32650a4..8861b1b 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerIssueMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerIssueMapperTest.java
@@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerIssue;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,7 +35,7 @@ public class CustomerIssueMapperTest extends AbstractTransactionalJUnit4SpringCo
m.setCustomerId("s");
m.setIssue("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
CustomerIssue m1 = mapper.find(id);
@@ -54,7 +55,7 @@ public class CustomerIssueMapperTest extends AbstractTransactionalJUnit4SpringCo
Assert.assertEquals("S", m.getCustomerId());
Assert.assertEquals("S", m.getIssue());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerMapperTest.java
index 47bed97..f588cfb 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerMapperTest.java
@@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.Customer;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +41,7 @@ public class CustomerMapperTest extends AbstractTransactionalJUnit4SpringContext
m.setRegion("s");
m.setStatus("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
Customer m1 = mapper.find(id);
@@ -78,7 +79,7 @@ public class CustomerMapperTest extends AbstractTransactionalJUnit4SpringContext
Assert.assertEquals("S", m.getRegion());
Assert.assertEquals("S", m.getLevel());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerPermissionMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerPermissionMapperTest.java
index 75c87e2..60e1487 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerPermissionMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerPermissionMapperTest.java
@@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerPermission;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,7 +35,7 @@ public class CustomerPermissionMapperTest extends AbstractTransactionalJUnit4Spr
m.setUserAccount("s");
m.setCustomerId("s");
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
CustomerPermission m1 = mapper.find(id);
@@ -54,7 +55,7 @@ public class CustomerPermissionMapperTest extends AbstractTransactionalJUnit4Spr
Assert.assertEquals("S", m.getUserAccount());
Assert.assertEquals("S", m.getCustomerId());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerYearToDateSaleMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerYearToDateSaleMapperTest.java
index 8014221..c318d6b 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerYearToDateSaleMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/CustomerYearToDateSaleMapperTest.java
@@ -1,6 +1,7 @@
package com.pudonghot.ambition.crm.mapper;
import com.pudonghot.ambition.crm.model.CustomerYearToDateSale;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,7 +36,7 @@ public class CustomerYearToDateSaleMapperTest extends AbstractTransactionalJUnit
m.setYear("s");
m.setYtdSale(1L);
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
CustomerYearToDateSale m1 = mapper.find(id);
@@ -58,7 +59,7 @@ public class CustomerYearToDateSaleMapperTest extends AbstractTransactionalJUnit
Assert.assertEquals("S", m.getYear());
Assert.assertEquals(2L, m.getYtdSale());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
index 2b1babe..7e45481 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/HomePageMapperTest.java
@@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Test;
import java.util.Date;
import org.junit.Assert;
@@ -38,7 +39,7 @@ public class HomePageMapperTest extends AbstractTransactionalJUnit4SpringContext
m.setCreatedBy("donghuang");
m.setDateCreated(new Date());
mapper.insert(m);
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
/*
// Your Test Logics
HomePage m1 = mapper.find(id);
@@ -58,7 +59,7 @@ public class HomePageMapperTest extends AbstractTransactionalJUnit4SpringContext
Assert.assertEquals("S", m.getPage());
Assert.assertEquals("S", m.getApplying());
// list
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
// delete
mapper.delete(id);
m1 = mapper.find(id);
diff --git a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
index 423b91f..77e032d 100644
--- a/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
+++ b/server/mapper/src/test/java/com/pudonghot/ambition/crm/mapper/UserMapperTest.java
@@ -1,5 +1,6 @@
package com.pudonghot.ambition.crm.mapper;
+import me.chyxion.tigon.mybatis.Search;
import org.junit.Test;
import org.junit.Assert;
import org.junit.runner.RunWith;
@@ -26,11 +27,11 @@ public class UserMapperTest extends AbstractTransactionalJUnit4SpringContextTest
@Test
public void mapperTest() {
- Assert.assertTrue(mapper.list(null).size() > 0);
+ Assert.assertTrue(mapper.list(new Search()).size() > 0);
}
@Test
public void testListProducts() {
- log.info("local products [{}].", localProductMapper.list(null));
+ log.info("local products [{}].", localProductMapper.list(new Search()));
}
}
diff --git a/server/pom.xml b/server/pom.xml
index 017bbd9..3bf8c06 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -16,11 +16,9 @@
1.8
1.8
utf-8
+
0.0.1-SNAPSHOT
-
-
-
- 2.0.3.RELEASE
+ 2.3.12.RELEASE
1.8.10