From 07075b5e71cb6cf2ca9cb9def57be92c5280378d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 04 Jan 2018 15:58:09 +0800
Subject: [PATCH] 账户管理

---
 src/main/java/com/moral/service/impl/AccountServiceImpl.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index c25281e..08c3f0c 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -26,7 +26,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 +44,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>();
@@ -109,6 +114,12 @@
 		}
 		PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
 		List<Account> accounts = accountMapper.selectByExample(example);
+		for (Account account : accounts) {
+			if (!ObjectUtils.isEmpty(account.getOrganizationId())) {
+				Organization organization = organizationMapper.selectByPrimaryKey(account.getOrganizationId());
+				account.setOrganization(organization);
+			}
+		}
 		return new PageBean<Account>(accounts);
 	}
 
@@ -127,16 +138,6 @@
 
 	@Override
 	@Transactional
-	public Integer deleteAccountByLogic(Account account) {
-		account.setIsDelete(Constants.IS_DELETE_TRUE);
-		if (account.getId() > 0) {
-			throw new BusinessException("hahahahahah..................");
-		}
-		return accountMapper.updateByPrimaryKeySelective(account);
-	}
-
-	@Override
-	@Transactional
 	public Integer deleteAccountsByLogic(List<Integer> ids) {
 		Account account = new Account();
 		account.setIsDelete(Constants.IS_DELETE_TRUE);
@@ -145,4 +146,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