|
|
@@ -144,7 +144,7 @@ public class UserController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PreAuthorize("hasRole('ADMIN')")
|
|
|
- @RequestMapping(value = "/get/list/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
|
|
|
+ @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
|
|
|
public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
|
|
|
try{
|
|
|
PageHelper.startPage(page, size);
|
|
|
@@ -156,6 +156,17 @@ public class UserController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
|
|
|
+ public String getUser(@PathVariable Integer userid){
|
|
|
+ try{
|
|
|
+ User u = userService.getOne(userid);
|
|
|
+ return returnResult(0, "获取成功", u);
|
|
|
+ }catch(Exception e){
|
|
|
+ throw new BusinessException(20001);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|