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/RoleService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/RoleService.java b/src/main/java/com/moral/service/RoleService.java
index 57e6acb..da108e9 100644
--- a/src/main/java/com/moral/service/RoleService.java
+++ b/src/main/java/com/moral/service/RoleService.java
@@ -11,9 +11,15 @@
int countByExample(PageBean pageBean);
- List<Role> getRoleListByName(String roleName);
-
PageBean getRoleList(PageBean pageBean);
+ PageBean queryByPageBean(PageBean pageBean);
+
void deleteByIds(Integer... ids);
+
+ List<Integer> getRoleIds(int accountId);
+
+ void allotRole(Integer accountId, Integer[] roleIds);
+
+ void allotMenu(Integer roleId, Integer[] menuOrders);
}
--
Gitblit v1.8.0