From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/AccountService.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java
index a93a979..0dd7c82 100644
--- a/src/main/java/com/moral/service/AccountService.java
+++ b/src/main/java/com/moral/service/AccountService.java
@@ -2,20 +2,39 @@
import java.util.List;
import java.util.Map;
+import java.util.Optional;
-import com.moral.common.bean.ResultBean;
+import com.moral.common.bean.PageBean;
import com.moral.entity.Account;
+import com.moral.entity.Role;
public interface AccountService {
Map<String, Object> screenLogin(Map<String, Object> parameters);
- List<Account> getAccountLists(String account, String password);
- List<Account> getAccountList(String account);
+ Map<String, Object> screenLoginNew(Map<String, Object> parameters);
- void setOrgIdsByAccount(Map<String, Object> parameters);
+ Account getAccountByAccountName(String account);
- ResultBean<Account> screenLogin1(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 deleteAccountsByLogic(List<Integer> ids);
+
+ Integer getAccountCountByAccountName(String accountName);
+
+ Optional<Account> queryAccountByName(String accountName);
+
+ Account companyLogin(Map<String, Object> parameters);
+
+ Map<String, Object> getOrganizationIdByAccountId(String id);
+
+ List<Role> getRolesByAccountName(String accountName);
+
+ Map<String, Object> getMenuListsByAccountName(String accountName);
}
--
Gitblit v1.8.0