|
@@ -136,9 +136,6 @@ public class AccountApiController extends AbstractApiController {
|
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
|
Condition c = new Condition(AccountFlow.class);
|
|
Condition c = new Condition(AccountFlow.class);
|
|
|
Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId());
|
|
Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId());
|
|
|
- if (param.getType() != null){
|
|
|
|
|
- criteria.andEqualTo("type",param.getType());
|
|
|
|
|
- }
|
|
|
|
|
if (param.getType() == 1 ){
|
|
if (param.getType() == 1 ){
|
|
|
criteria.andGreaterThanOrEqualTo("createTime", DateUtil.today());
|
|
criteria.andGreaterThanOrEqualTo("createTime", DateUtil.today());
|
|
|
} else if (param.getType() == 2){
|
|
} else if (param.getType() == 2){
|
