|
@@ -76,9 +76,10 @@ public class UserManageController {
|
|
|
@ApiParam(value = "用户名", required = true) @RequestParam(required = true) String username,
|
|
|
@ApiParam(value = "真实姓名", required = false) @RequestParam(required = false) String name,
|
|
|
@ApiParam(value = "手机号码", required = true) @RequestParam(required = true) String mobilePhone,
|
|
|
- @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId
|
|
|
+ @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId,
|
|
|
+ @ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer orgId
|
|
|
) {
|
|
|
- userService.addUser(StringUtils.trim(username), StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId);
|
|
|
+ userService.addUser(StringUtils.trim(username), StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId,orgId);
|
|
|
return new AjaxMessage(ResultStatus.OK);
|
|
|
}
|
|
|
|
|
@@ -89,10 +90,11 @@ public class UserManageController {
|
|
|
@ApiParam(value = "用户id", required = true) @RequestParam(required = true) Integer id,
|
|
|
@ApiParam(value = "真实姓名", required = false) @RequestParam(required = false) String name,
|
|
|
@ApiParam(value = "手机号码", required = true) @RequestParam(required = true) String mobilePhone,
|
|
|
- @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId
|
|
|
+ @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId,
|
|
|
+ @ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer orgId
|
|
|
) {
|
|
|
|
|
|
- userService.editUser(id, StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId);
|
|
|
+ userService.editUser(id, StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId,orgId);
|
|
|
return new AjaxMessage(ResultStatus.OK);
|
|
|
}
|
|
|
|