From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/AccountMapper.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/AccountMapper.java b/src/main/java/com/moral/mapper/AccountMapper.java
index 9a85a32..c3bfbed 100644
--- a/src/main/java/com/moral/mapper/AccountMapper.java
+++ b/src/main/java/com/moral/mapper/AccountMapper.java
@@ -7,15 +7,29 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Account;
+import com.moral.entity.Menu;
+import com.moral.entity.Role;
 
 public interface AccountMapper extends BaseMapper<Account> {
 
-	List<Map<String, Object>> getRoleNameByAccountId(Integer accountId);
+    List<Map<String, Object>> getRoleNameByAccountId(Integer accountId);
 
-	Account getByAccountName(String name);
+    Account getByAccountName(String name);
 
-	Map<String, Object> getOrganizationIdByAccountId(Integer accountId);
+    Map<String, Object> getOrganizationIdByAccountId(Integer accountId);
 
     List<Account> getAccountList(@Param("accountName") String accountName);
 
+    List<Role> getRolesByAccountName(@Param("accountName") String accountName);
+
+    List<Menu> getParentMenuListsByAccountName(@Param("accountName") String accountName);
+
+    String getEmailByAccountName(@Param("accountName") String accountName);
+
+    List<Menu> getChildMenuIdsByAccountName(@Param("accountName") String accountName, @Param("id") Integer id);
+
+    List<Menu> getScreenMenuListsByAccountName(@Param("accountName") String accountName);
+
+    Integer getScreenRoleByAccountName(@Param("accountName") String accountName);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0