From daa697719eb0ddfd170f1ab94c5422a4f5b93951 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 18 Sep 2020 14:36:54 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleController.java
index 16f9b80..65168fa 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleController.java
@@ -71,6 +71,16 @@
List<SysRole> result = sysRoleService.findAll();
return ResultBody.ok().data(result);
}
+ /**
+ * 用户管理根据条件查询角色
+ * @return
+ */
+ @ApiOperation(value = "后台管理查询角色")
+ @GetMapping("/findByMap")
+ public ResultBody<List<SysRole>> findByMap(@RequestParam Map<String, Object> params) {
+ List<SysRole> result = sysRoleService.findByMap(params);
+ return ResultBody.ok().data(result);
+ }
/**
* 角色新增或者更新
--
Gitblit v1.8.0