From 293d5042a773595ded45bdc9c69c4555ab9c5dd5 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Thu, 14 May 2020 18:39:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java index 0bd18d0..57ee9a2 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java @@ -327,15 +327,25 @@ } /** - * 是否超级管理员 + * 根据map查询 */ private boolean checkAdmin(long id) { return id == 1L; } @PostMapping("/users/findAll") - public ResultBody findAll(@RequestParam Map<String,Object> map) { + public ResultBody findAll( @RequestBody Map<String,Object> map) { return appUserService.findAll(map); } + + /** + * 根据map查询 总个数 + * @param map + * @return + */ + @PostMapping("/users/findCountByMap") + public ResultBody findCountByMap( @RequestBody Map<String,Object> map) { + return appUserService.findCountByMap(map); + } /** * 获取当前用的 组织下的所有人员 */ -- Gitblit v1.8.0