From d10235124e675103c1a27fb5aeff337493413cc2 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 22 Aug 2019 16:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 87ee342..243ac98 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;
@@ -61,6 +62,7 @@
result.put("msg", "���������������");
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
+ setOrgIdsByAccount(result);
} else {
result.put("msg","���������������������������������������������");
}
@@ -80,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 ������������������");
}
@@ -182,6 +184,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());
--
Gitblit v1.8.0