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 | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 0a93e6b..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;
@@ -26,7 +27,9 @@
import com.moral.common.util.Crypto;
import com.moral.common.util.ResourceUtil;
import com.moral.entity.Account;
+import com.moral.entity.Organization;
import com.moral.mapper.AccountMapper;
+import com.moral.mapper.OrganizationMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
@@ -42,6 +45,9 @@
@Resource
private OrganizationService organizationService;
+ @Resource
+ private OrganizationMapper organizationMapper;
+
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -69,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");
@@ -109,6 +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())) {
+ 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);
}
@@ -127,13 +156,6 @@
@Override
@Transactional
- public Integer deleteAccountByLogic(Account account) {
- account.setIsDelete(Constants.IS_DELETE_TRUE);
- return accountMapper.updateByPrimaryKeySelective(account);
- }
-
- @Override
- @Transactional
public Integer deleteAccountsByLogic(List<Integer> ids) {
Account account = new Account();
account.setIsDelete(Constants.IS_DELETE_TRUE);
@@ -142,4 +164,11 @@
return accountMapper.updateByExampleSelective(account, example);
}
+ @Override
+ public Integer getAccountCountByAccountName(String accountName) {
+ Account account = new Account();
+ account.setAccountName(accountName);
+ return accountMapper.selectCount(account);
+ }
+
}
--
Gitblit v1.8.0