|
@@ -34,6 +34,9 @@ public class UserController {
|
|
@ApiOperation("USER:用户列表")
|
|
@ApiOperation("USER:用户列表")
|
|
@GetMapping("list")
|
|
@GetMapping("list")
|
|
public Response<PageBean<GihonUser>> list(@Validated UserListReq search) {
|
|
public Response<PageBean<GihonUser>> list(@Validated UserListReq search) {
|
|
|
|
+ if (search.getCompanyId() == null) {
|
|
|
|
+ search.setCompanyId(AuthUtils.getCompanyId());
|
|
|
|
+ }
|
|
IPage<GihonUser> list = gihonUserService.getUserlistPage(search);
|
|
IPage<GihonUser> list = gihonUserService.getUserlistPage(search);
|
|
return Response.okPage(list);
|
|
return Response.okPage(list);
|
|
}
|
|
}
|
|
@@ -57,7 +60,6 @@ public class UserController {
|
|
public Response<GihonUser> user(@Validated @PathVariable Long id) {
|
|
public Response<GihonUser> user(@Validated @PathVariable Long id) {
|
|
return Response.ok(gihonUserService.getById(id));
|
|
return Response.ok(gihonUserService.getById(id));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
|
|
@ApiOperation("USER:新增")
|
|
@ApiOperation("USER:新增")
|
|
@PostMapping("")
|
|
@PostMapping("")
|