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/mapper/AccountMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/AccountMapper.java b/src/main/java/com/moral/mapper/AccountMapper.java
index 22aaf08..c3bfbed 100644
--- a/src/main/java/com/moral/mapper/AccountMapper.java
+++ b/src/main/java/com/moral/mapper/AccountMapper.java
@@ -3,10 +3,33 @@
import java.util.List;
import java.util.Map;
+import org.apache.ibatis.annotations.Param;
+
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);
+
+ 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