donghuang/tigon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add table to sub search

Browse Source
This commit is contained in:
Shaun Chyxion 2017-06-26 23:44:31 +08:00
parent 74c21c0965
commit 135462990c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tigon-model/src/main/java/me/chyxion/tigon/mybatis/Search.java
View File

@ -4,6 +4,7 @@ import java.util.*;
import java.io.Serializable; import java.io.Serializable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import me.chyxion.tigon.model.BaseModel; import me.chyxion.tigon.model.BaseModel;
import org.apache.commons.lang3.StringUtils;
/** /**
* @version 0.0.1 * @version 0.0.1
@ -298,6 +299,9 @@ public class Search implements Serializable {
*/ */
public Search and(Search search) { public Search and(Search search) {
Assert.notNull(search, "And Search Could Not Be Null"); Assert.notNull(search, "And Search Could Not Be Null");
if (StringUtils.isBlank(search.table)) {
search.table = table;
}
Assert.state(this != search, "And Search Could Not Be Self"); Assert.state(this != search, "And Search Could Not Be Self");
criteria.add(new Criterion(CriterionType.AND, search)); criteria.add(new Criterion(CriterionType.AND, search));
return this; return this;
@ -309,6 +313,9 @@ public class Search implements Serializable {
*/ */
public Search or(Search search) { public Search or(Search search) {
Assert.notNull(search, "Or Search Could Not Be Null"); Assert.notNull(search, "Or Search Could Not Be Null");
if (StringUtils.isBlank(search.table)) {
search.table = table;
}
Assert.state(this != search, "Or Search Could Not Be Self"); Assert.state(this != search, "Or Search Could Not Be Self");
criteria.add(new Criterion(CriterionType.OR, search)); criteria.add(new Criterion(CriterionType.OR, search));
return this; return this;
@ -320,7 +327,7 @@ public class Search implements Serializable {
* @return this * @return this
*/ */
public Search or(String col, Object value) { public Search or(String col, Object value) {
return or(new Search(col, value)); return or(new Search(col, value).table(table));
} }
/** /**