Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

Merge remote-tracking branch 'origin/master'

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -62,6 +62,7 @@
                result.put("msg", "登录成功！");

                result.put("accountId", account.getId());

                result.put("orgId", account.getOrganizationId());

                setOrgIdsByAccount(result);

            } else {

                result.put("msg","您的账号已禁用，请联系管理员！");

            }

@@ -81,9 +82,9 @@
    }

    @Override

    public void setOrgIdsByAccount(Map<String, Object> parameters) {

        String accountId = (String) parameters.get("accountId");

        String accountId = parameters.get("accountId").toString();

        accountId = accountId.replaceFirst("-", "");

        if (!isNumeric((String) parameters.get("accountId"))) {

        if (!isNumeric(accountId)) {

            throw new BusinessException("accountId 参数不合法！");

        }