出入流水

cif-service/src/main/java/com/txz/cif/web/AccountApiController.java

@@ -133,10 +133,13 @@ public class AccountApiController extends AbstractApiController {
 		if (user == null){
 			return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
 		}
+		Account account = accountService.getAccount(userId, 1);
+		if (account == null){
+			return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
+		}
 		PageHelper.startPage(param.getPage(), param.getSize());
 		Condition c = new Condition(AccountFlow.class);
-		Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId())
-				.andEqualTo("aliases","202");
+		Criteria criteria = c.createCriteria().andEqualTo("accountId",account.getId());
 		if (param.getType() == 1 ){
 			criteria.andGreaterThanOrEqualTo("createTime", DateUtil.today());
 		} else if (param.getType() == 2){
@@ -158,7 +161,6 @@ public class AccountApiController extends AbstractApiController {
 		PageInfo pageInfo = new PageInfo(flows);
 		List<AccountFlowBO> bos = flows.stream().map(temp -> {
 			AccountFlowBO bo = temp.generator();
-			Account account = accountService.findById(bo.getAccountId());
 			if (account != null){
 				bo.setAccountName(account.getName());
 			}