[pinpoint-apm#1723] User select API was changed searching logic

minwoo-jung · Apr 27, 2016 · cf6aa24 · cf6aa24
1 parent 5ec22f4
commit cf6aa24
Showing 1 changed file with 2 additions and 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
@@ -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();