From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/java/com/moral/service/AccountService.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java
index 36cff2f..68e8371 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,14 +13,17 @@
 
 	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);
 
 	Integer saveOrUpdateAccount(Account account);
 
-	Integer deleteAccountByLogic(Account account);
-
 	Integer deleteAccountsByLogic(List<Integer> ids);
 
+	Integer getAccountCountByAccountName(String accountName);
+
+	Optional<Account> queryAccountByName(String accountName);
 }

--
Gitblit v1.8.0