From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Thu, 12 Jul 2018 16:07:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/impl/AccountServiceImpl.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java index 1fbcfa1..cf1ef0c 100644 --- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java @@ -22,6 +22,7 @@ import com.moral.common.exception.BusinessException; import com.moral.common.util.Crypto; import com.moral.common.util.ResourceUtil; +import com.moral.common.util.ValidateUtil; import com.moral.entity.Account; import com.moral.entity.Organization; import com.moral.mapper.AccountMapper; @@ -179,4 +180,22 @@ Account account = accountMapper.getByAccountName(accountName); return Optional.ofNullable(account); } + + @Override + public Account companyLogin(Map<String, Object> parameters) { + ValidateUtil.notNull(parameters.get("account"), "param.is.null"); + ValidateUtil.notNull(parameters.get("password"), "param.is.null"); + Account account = new Account(); + account.setIsDelete(Constants.IS_DELETE_FALSE); + account.setAccountName(parameters.get("account").toString()); + account = accountMapper.selectOne(account); + if (ObjectUtils.isEmpty(account)) { + throw new BusinessException("���������������������������������������"); + } + if (!encoder.matches(parameters.get("password").toString(), account.getPassword())) { + throw new BusinessException("���������������������������������"); + } + account.setPassword(parameters.get("password").toString()); + return account; + } } -- Gitblit v1.8.0