From b28a5002a58d8d0b37082da12e5b218f0951de47 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 04 Dec 2017 16:46:44 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index aee503f..7d414c8 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -12,12 +12,11 @@
import java.util.Map;
import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+
import org.springframework.stereotype.Service;
-import com.moral.common.bean.ResultBean;
import com.moral.common.exception.BusinessException;
-import com.moral.common.util.Crypto;
import com.moral.entity.Account;
import com.moral.entity.AccountExample;
import com.moral.mapper.AccountMapper;
@@ -26,10 +25,11 @@
@Service
public class AccountServiceImpl implements AccountService {
- @Autowired
+
+ @Resource
private AccountMapper accountMapper;
- @Autowired
+ @Resource
private OrganizationService organizationService;
@Override
@@ -46,6 +46,7 @@
if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
result.put("msg", "���������������");
result.put("accountId", account.getId());
+ result.put("orgId", account.getOrganizationId());
} else {
result.put("msg","���������������������������������������������");
}
@@ -53,29 +54,6 @@
return result;
}
- @Override
- public ResultBean<Account> screenLogin1(Map<String, Object> parameters) {
- ResultBean<Account> resultBean = new ResultBean<Account>();
- AccountExample example = new AccountExample();
- String password = Crypto.md5((String) parameters.get("password"));
- example.or().andAccountNameEqualTo((String) parameters.get("account")).andPasswordEqualTo(password);
- List<Account> accounts = accountMapper.selectByExample(example);
- if (isEmpty(accounts) || accounts.size() != 1) {
- resultBean.setMsg("���������������������������������");
- resultBean.setCode(ResultBean.FAIL);
- } else {
- Account account = accounts.get(0);
- if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
- resultBean.setData(account);
- } else {
- resultBean.setCode(ResultBean.NO_PERMISSION);
- resultBean.setMsg("���������������������������������������������");
- }
- }
- return resultBean;
- }
-
-
@Override
public List<Account> getAccountLists(String accountName, String password) {
AccountExample example = new AccountExample();
--
Gitblit v1.8.0