From 1b583e6ebb41e1c61d5c8b8c30c69211cc06e6d3 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 08 Jan 2018 11:55:46 +0800
Subject: [PATCH] 账户管理
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 17 +++++++++++++++--
src/main/java/com/moral/entity/Account.java | 4 +++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 7e105bd..02eb11e 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -69,7 +69,9 @@
* @mbggenerated Thu Dec 07 16:17:21 CST 2017
*/
private Date expireTime;
-
+
+ private String userName;
+
@Transient
private Organization organization;
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 08c3f0c..1680f0c 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;
@@ -114,12 +115,24 @@
}
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());
}
}
+ 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