From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master

---
 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