diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/UserController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/UserController.java index 54316caf3a504..cc70ffc65298a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/UserController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/UserController.java @@ -92,8 +92,8 @@ public Object getUser(@RequestParam(value="userId", required=false) String userI users.add(userService.selectUserByUserId(userId)); return users; } else if (searchKey != null) { - List users = userService.selectUserByUserName(searchKey); - users.addAll(userService.selectUserByDepartment(searchKey)); + List users = userService.selectUserByDepartment(searchKey); + users.addAll(userService.selectUserByUserName(searchKey)); return users; } else { return userService.selectUser();