|
@@ -140,7 +140,7 @@ public class SysUserController extends BaseController {
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
- @PutMapping
|
|
|
|
|
|
+ @PostMapping("/put")
|
|
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());
|
|
@@ -162,7 +162,7 @@ public class SysUserController extends BaseController {
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:remove')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:remove')")
|
|
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
- @DeleteMapping("/{userIds}")
|
|
|
|
|
|
+ @GetMapping("/delete/{userIds}")
|
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
|
if (ArrayUtils.contains(userIds, getUserId())) {
|
|
if (ArrayUtils.contains(userIds, getUserId())) {
|
|
return error("当前用户不能删除");
|
|
return error("当前用户不能删除");
|
|
@@ -175,7 +175,7 @@ public class SysUserController extends BaseController {
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
- @PutMapping("/resetPwd")
|
|
|
|
|
|
+ @PostMapping("/resetPwd")
|
|
public AjaxResult resetPwd(@RequestBody SysUser user) {
|
|
public AjaxResult resetPwd(@RequestBody SysUser user) {
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
if (ONE.equals(userService.checkStrongPwd(user))) {
|
|
if (ONE.equals(userService.checkStrongPwd(user))) {
|
|
@@ -192,7 +192,7 @@ public class SysUserController extends BaseController {
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
- @PutMapping("/changeStatus")
|
|
|
|
|
|
+ @PostMapping("/changeStatus")
|
|
public AjaxResult changeStatus(@RequestBody SysUser user) {
|
|
public AjaxResult changeStatus(@RequestBody SysUser user) {
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserDataScope(user.getUserId());
|
|
userService.checkUserDataScope(user.getUserId());
|
|
@@ -219,7 +219,7 @@ public class SysUserController extends BaseController {
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
|
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
|
- @PutMapping("/authRole")
|
|
|
|
|
|
+ @PostMapping("/authRole")
|
|
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
|
|
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
|
|
userService.checkUserDataScope(userId);
|
|
userService.checkUserDataScope(userId);
|
|
userService.insertUserAuth(userId, roleIds);
|
|
userService.insertUserAuth(userId, roleIds);
|