From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java | 5 +++++
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 4 ++--
src/main/java/com/mindskip/xzs/repository/UserMapper.java | 1 +
src/main/java/com/mindskip/xzs/service/UserService.java | 1 +
src/main/resources/mapper/UserMapper.xml | 7 +++++++
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 63a9b14..a645248 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -82,7 +82,7 @@
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(id);
UserResponseVM userVm = UserResponseVM.from(user);
List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
String deptIds = "";
@@ -188,7 +188,7 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public RestResponse delete(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(id);
user.setDeleted(true);
userService.updateByIdFilter(user);
return RestResponse.ok();
diff --git a/src/main/java/com/mindskip/xzs/repository/UserMapper.java b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
index 0667ad9..036dbbb 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -33,6 +33,7 @@
* @return User
*/
User getUserById(Integer id);
+ User getUserInfoById(Integer id);
/**
* getUserByUserName
diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index cfabe4b..a1e69f6 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -27,6 +27,7 @@
* @return User
*/
User getUserById(Integer id);
+ User getUserInfoById(Integer id);
/**
* getUserByUserName
diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
index 792341e..92d2ae9 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -48,6 +48,11 @@
}
@Override
+ public User getUserInfoById(Integer id) {
+ return userMapper.getUserInfoById(id);
+ }
+
+ @Override
public User getUserByUserName(String username) {
return userMapper.getUserByUserName(username);
}
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 1a1de5d..06534e2 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -271,6 +271,13 @@
where id=#{value} and status = 1 and deleted = 0 and (`condition` = 0 or `condition` is null)
</select>
+ <select id="getUserInfoById" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from t_user
+ where id=#{value} and deleted = 0
+ </select>
+
<select id="getUserByUserName" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
--
Gitblit v1.8.0