From 6d44e6f4d503a603fcb1323755f4b0c854d69be0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 16:48:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 2259d4d..9bdfae7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -324,7 +324,8 @@
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
return error("当前用户不能删除");
}
- return toAjax(userService.deleteUserByIds(userIds));
+ userService.deleteUserByIds(userIds);
+ return AjaxResult.success();
}
@@ -425,7 +426,7 @@
@InnerAuth
@GetMapping("/infoShop/{username}")
public R<LoginUser> infoShop(@PathVariable("username") String username) {
- SysUser sysUser = userService.selectUserByUserName(username);
+ SysUser sysUser = userService.selectUserShopByUserName(username);
if (StringUtils.isNull(sysUser)) {
return R.fail("用户名或密码错误");
}
--
Gitblit v1.7.1