From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 02 Sep 2019 17:42:06 +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 |   12 ++++++++++--
 1 files changed, 10 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 cf1ef0c..a3c53db 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/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 ������������������");
 		}
 
@@ -198,4 +199,11 @@
 		account.setPassword(parameters.get("password").toString());
 		return account;
 	}
+
+	@Override
+	public Map<String, Object> getOrganizationIdByAccountId(String id) {
+		Integer accountId = Integer.parseInt(id);
+		Map<String, Object> map = accountMapper.getOrganizationIdByAccountId(accountId);
+		return map;
+	}
 }

--
Gitblit v1.8.0