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

table bug fixes

Browse Source
This commit is contained in:
Shaun Chyxion 2017-06-27 00:18:42 +08:00
parent 135462990c
commit 3136e1a364
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tigon-model/src/main/java/me/chyxion/tigon/mybatis/AndSearchProcessor.java
View File

@ -1,5 +1,7 @@
package me.chyxion.tigon.mybatis; package me.chyxion.tigon.mybatis;
import org.apache.commons.lang3.StringUtils;
/** /**
* @author Donghuang <br> * @author Donghuang <br>
* donghuang@wacai.com <br> * donghuang@wacai.com <br>
@ -20,6 +22,10 @@ class AndSearchProcessor extends AbstractSearchProcessor {
*/ */
@Override @Override
void doProcess(SearchProcessArgs args) { void doProcess(SearchProcessArgs args) {
args.getResult().addAll(args.getCondition().getSearch().assemble(true)); final Search search = args.getCondition().getSearch();
if (StringUtils.isBlank(search.table())) {
search.table(args.getTable());
}
args.getResult().addAll(search.assemble(true));
} }
} }

14
tigon-model/src/main/java/me/chyxion/tigon/mybatis/OrSearchProcessor.java
View File

@ -1,5 +1,7 @@
package me.chyxion.tigon.mybatis; package me.chyxion.tigon.mybatis;
import org.apache.commons.lang3.StringUtils;
/** /**
* @author Shaun Chyxion <br> * @author Shaun Chyxion <br>
* chyxion@163.com <br> * chyxion@163.com <br>
@ -7,11 +9,17 @@ package me.chyxion.tigon.mybatis;
*/ */
class OrSearchProcessor implements SearchProcessor { class OrSearchProcessor implements SearchProcessor {
/**
* {@inheritDoc}
*/
@Override @Override
public boolean accept(SearchProcessArgs args) { public boolean accept(SearchProcessArgs args) {
return CriterionType.OR.equals(args.getCondition().getType()); return CriterionType.OR.equals(args.getCondition().getType());
} }
/**
* {@inheritDoc}
*/
@Override @Override
public void process(SearchProcessArgs args) { public void process(SearchProcessArgs args) {
if (args.isHasPrevCol()) { if (args.isHasPrevCol()) {
@ -20,6 +28,10 @@ class OrSearchProcessor implements SearchProcessor {
else { else {
args.setHasPrevOrCol(true); args.setHasPrevOrCol(true);
} }
args.getResult().addAll(args.getCondition().getSearch().assemble(true)); final Search search = args.getCondition().getSearch();
if (StringUtils.isBlank(search.table())) {
search.table(args.getTable());
}
args.getResult().addAll(search.assemble(true));
} }
} }

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

@ -483,12 +483,20 @@ public class Search implements Serializable {
return this; return this;
} }
/**
* get table
* @return table
*/
String table() {
return this.table;
}
List<Object> assemble(boolean subSearch) { List<Object> assemble(boolean subSearch) {
List<Object> result = new LinkedList<Object>(); List<Object> result = new LinkedList<Object>();
SearchProcessArgs args = new SearchProcessArgs(table, result); final SearchProcessArgs args = new SearchProcessArgs(table, result);
for (Criterion condition : criteria) { for (final Criterion criterion : criteria) {
args.setCondition(condition); args.setCondition(criterion);
for (SearchProcessor processor : PROCESSORS) { for (final SearchProcessor processor : PROCESSORS) {
if (processor.accept(args)) { if (processor.accept(args)) {
processor.process(args); processor.process(args);
break; break;