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/controller/admin/UserController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 99ce044..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 = "";
@@ -138,16 +138,18 @@
}
Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
- for (Integer s : model.getDeptIds()) {
- UserDepartment userDepartment = new UserDepartment();
- userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(s);
- if (Objects.nonNull(oldDeptUser.get(s))) {
- userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
- } else {
- userDepartment.setDeptAdmin("0");
+ if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
+ for (Integer s : model.getDeptIds()) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
+ userDepartmentMapper.insert(userDepartment);
}
- userDepartmentMapper.insert(userDepartment);
}
tagService.removeUserTagByUserId(user.getId());
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
@@ -186,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();
@@ -231,4 +233,14 @@
return RestResponse.ok();
}
+ @GetMapping("/getFailExamUser/{examPaperId}")
+ public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
+ return RestResponse.ok(userService.getFailExamUser(examPaperId));
+ }
+
+ @GetMapping("/getFailTemplateUser/{templateId}")
+ public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
+ return RestResponse.ok(userService.getFailTemplateUser(templateId));
+ }
+
}
--
Gitblit v1.8.0