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/AccountService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java
index e0ebbb5..5ac31a0 100644
--- a/src/main/java/com/moral/service/AccountService.java
+++ b/src/main/java/com/moral/service/AccountService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import com.moral.common.bean.PageBean;
 import com.moral.entity.Account;
@@ -12,7 +13,9 @@
 
 	Account getAccountByAccountName(String account);
 
-	void setOrgIdsByAccount(Map<String, Object> parameters);
+    Account getAccountById(Integer id);
+
+    void setOrgIdsByAccount(Map<String, Object> parameters);
 
 	PageBean<Account> getAccountListByPage(Map<String, Object> parameters);
 
@@ -20,4 +23,9 @@
 
 	Integer deleteAccountsByLogic(List<Integer> ids);
 
+	Integer getAccountCountByAccountName(String accountName);
+
+	Optional<Account> queryAccountByName(String accountName);
+
+	Account companyLogin(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0