From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/mapper/AccountMapper.java b/src/main/java/com/moral/mapper/AccountMapper.java
index bdd0b89..c3bfbed 100644
--- a/src/main/java/com/moral/mapper/AccountMapper.java
+++ b/src/main/java/com/moral/mapper/AccountMapper.java
@@ -12,11 +12,11 @@
 
 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);
 
@@ -28,4 +28,8 @@
 
     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