代码提交
This commit is contained in:
parent
ac01bcef6e
commit
2599234c5b
|
|
@ -147,7 +147,7 @@ public class SysUserController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("system:user:edit")
|
@RequiresPermissions("system:user:edit")
|
||||||
@SysLog(title = "用户管理", businessType = OperaType.UPDATE, logType = 1, module = "系统管理->用户管理", details = "修改用户")
|
@SysLog(title = "用户管理", businessType = OperaType.UPDATE, logType = 1, module = "系统管理->用户管理", details = "修改用户")
|
||||||
@PutMapping
|
@PostMapping("editUser")
|
||||||
public AjaxResult edit(@Validated @RequestBody SysUser user) {
|
public AjaxResult edit(@Validated @RequestBody SysUser user) {
|
||||||
userService.checkUserAllowed(user);
|
userService.checkUserAllowed(user);
|
||||||
userService.checkUserDataScope(user.getUserId());
|
userService.checkUserDataScope(user.getUserId());
|
||||||
|
|
@ -170,12 +170,12 @@ public class SysUserController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("system:user:remove")
|
@RequiresPermissions("system:user:remove")
|
||||||
@SysLog(title = "用户管理", businessType = OperaType.DELETE, logType = 1, module = "系统管理->用户管理", details = "删除用户")
|
@SysLog(title = "用户管理", businessType = OperaType.DELETE, logType = 1, module = "系统管理->用户管理", details = "删除用户")
|
||||||
@DeleteMapping("/{userIds}")
|
@PostMapping("delUser")
|
||||||
public AjaxResult remove(@PathVariable Long[] userIds) {
|
public AjaxResult remove(@RequestBody SysUser user) {
|
||||||
if (ArrayUtils.contains(userIds, getUserId())) {
|
if (user.getUserId().equals(getUserId()) ) {
|
||||||
return error("当前用户不能删除");
|
return error("当前用户不能删除");
|
||||||
}
|
}
|
||||||
return toAjax(userService.deleteUserByIds(userIds));
|
return toAjax(userService.deleteUserById(user.getUserId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue