From 24b5764532e012274759d71ed02844ad2eb901e4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 30 Jan 2018 16:37:36 +0800
Subject: [PATCH] api接口调整
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 08c3f0c..be7b39a 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -9,6 +9,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -74,7 +75,10 @@
account.setAccountName(accountName);
return accountMapper.selectOne(account);
}
-
+ @Override
+ public Account getAccountById(Integer id){
+ return accountMapper.selectByPrimaryKey(id);
+ }
@Override
public void setOrgIdsByAccount(Map<String, Object> parameters) {
String accountId = (String) parameters.get("accountId");
@@ -114,12 +118,26 @@
}
PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
List<Account> accounts = accountMapper.selectByExample(example);
+ Set<Integer> organizationIds = new HashSet<Integer>();
for (Account account : accounts) {
if (!ObjectUtils.isEmpty(account.getOrganizationId())) {
- Organization organization = organizationMapper.selectByPrimaryKey(account.getOrganizationId());
- account.setOrganization(organization);
+ organizationIds.add(account.getOrganizationId());
}
}
+ if(!ObjectUtils.isEmpty(organizationIds)){
+ example = new Example(Organization.class);
+ example.or().andIn("id", organizationIds);
+ List<Organization> organizations = organizationMapper.selectByExample(example);
+ for (Account account : accounts) {
+ for (Organization organization : organizations) {
+ if (account.getOrganizationId() == organization.getId()) {
+ account.setOrganization(organization);
+ break;
+ }
+ }
+ }
+ }
+
return new PageBean<Account>(accounts);
}
--
Gitblit v1.8.0