From cf6aa248c69b5a326d70f799a804e000de66c491 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <minwoo.jung@navercorp.com>
Date: Wed, 27 Apr 2016 16:18:09 +0900
Subject: [PATCH] [#1723] User select API was changed searching logic

---
 .../com/navercorp/pinpoint/web/controller/UserController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<User> users = userService.selectUserByUserName(searchKey);
-                users.addAll(userService.selectUserByDepartment(searchKey));
+                List<User> users = userService.selectUserByDepartment(searchKey);
+                users.addAll(userService.selectUserByUserName(searchKey));
                 return users;
             } else {
                 return userService.selectUser();