Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 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;

@@ -182,6 +183,8 @@


   @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());