From 017cf2fc945cb795e2c46800cf0e0a940f95f408 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 22 Jun 2017 13:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=AB=98=E5=8D=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/UsersController.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index d394bc7..2179209 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -191,20 +191,23 @@ public class UsersController extends BaseController { @RequestMapping(value = "/usersbyorg", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseListResponse getUsers(@RequestParam(value = "orgId", required = false) Integer orgId){ + public BaseListResponse getUsers(@RequestParam(value = "orgId", required = false) String orgId){ UsersQuery usersQuery = new UsersQuery(); - - usersQuery.setYn(YnEnums.YES.getId()); - usersQuery.setType(1); - usersQuery.setOrgId(orgId); - List usersList = usersService.queryUsers(usersQuery); List data = new ArrayList(); - for(Users users1:usersList){ - Map map = new HashMap(); - map.put("id",users1.getId()); - map.put("name",users1.getName()); - data.add(map); + if(NumberUtils.isNumber(orgId)){ + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setType(1); + usersQuery.setOrgId(Integer.valueOf(orgId)); + List usersList = usersService.queryUsers(usersQuery); + + for(Users users1:usersList){ + Map map = new HashMap(); + map.put("id",users1.getId()); + map.put("name",users1.getName()); + data.add(map); + } } + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(data); } -- 1.8.3.1