From 135462990c0e414ae231a2c60f56347a32faee50 Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Mon, 26 Jun 2017 23:44:31 +0800 Subject: [PATCH] add table to sub search --- .../src/main/java/me/chyxion/tigon/mybatis/Search.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tigon-model/src/main/java/me/chyxion/tigon/mybatis/Search.java b/tigon-model/src/main/java/me/chyxion/tigon/mybatis/Search.java index ca365f0..55356db 100644 --- a/tigon-model/src/main/java/me/chyxion/tigon/mybatis/Search.java +++ b/tigon-model/src/main/java/me/chyxion/tigon/mybatis/Search.java @@ -4,6 +4,7 @@ import java.util.*; import java.io.Serializable; import org.springframework.util.Assert; import me.chyxion.tigon.model.BaseModel; +import org.apache.commons.lang3.StringUtils; /** * @version 0.0.1 @@ -298,6 +299,9 @@ public class Search implements Serializable { */ public Search and(Search search) { 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"); criteria.add(new Criterion(CriterionType.AND, search)); return this; @@ -309,6 +313,9 @@ public class Search implements Serializable { */ public Search or(Search search) { 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"); criteria.add(new Criterion(CriterionType.OR, search)); return this; @@ -320,7 +327,7 @@ public class Search implements Serializable { * @return this */ public Search or(String col, Object value) { - return or(new Search(col, value)); + return or(new Search(col, value).table(table)); } /**