From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Mon, 02 Jul 2018 10:54:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/AccountService.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java index c82b183..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); @@ -22,4 +25,7 @@ Integer getAccountCountByAccountName(String accountName); + Optional<Account> queryAccountByName(String accountName); + + Account companyLogin(Map<String, Object> parameters); } -- Gitblit v1.8.0