From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
index 91084c0..0b7e488 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
@@ -18,18 +18,60 @@
 @Transactional
 public interface ManageRoleService extends IService<ManageRole> {
 
-    @Transactional
-    List<ManageRole> getAll();
+    /**
+     * @Description: ������������������
+     * @Param: [Map]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
+    Map<String,Object> getAllWithPagingQuery(Map map);
 
+    /**
+     * @Description: ������������
+     * @Param: [ManageRole, List]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
     @Transactional
     Map<String,Object> insertOne(ManageRole manageRole,List list);
 
+    /**
+     * @Description: ������������
+     * @Param: [Map]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
     @Transactional
     Map<String,Object> updateManageRole(Map map);
 
-    @Transactional
-    List<ManageRole> getManageRoleByNameFuzzy(ManageRole manageRole);
+    /**
+     * @Description: ������������������
+     * @Param: [Map]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
+    Map<String,Object> getManageRoleByNameFuzzy(Map map);
 
+    /**
+     * @Description: ������������
+     * @Param: [Map]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
     @Transactional
     Map<String,Object> deleteManageRole(Map map);
+
+    /**
+     * @Description: ������������id������������������������
+     * @Param: [Map]
+     * @return: Map
+     * @Author: ���������
+     * @Date: 2021/7/26
+     */
+    ManageRole getRoleByAccountId(Integer accountId);
 }

--
Gitblit v1.8.0