From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 03 七月 2024 18:29:31 +0800
Subject: [PATCH] feat：新增随机时间题目配置
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 db30138..8478851 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -21,10 +21,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
@@ -52,9 +49,8 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
- PageInfo<User> pageInfo = userService.userPage(model);
- PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
- UserResponseVM.from(d));
+ model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
+ PageInfo<UserResponseVM> page = userService.userPage(model);
page.setList(page.getList().stream().map(e->{
List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
List<Department> list = new ArrayList<>();
@@ -95,6 +91,7 @@
}
userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
+ userVm.setPassword(authenticationService.pwdDecode(user.getPassword()));
return RestResponse.ok(userVm);
}
@@ -139,11 +136,17 @@
user.setModifyTime(new Date());
userService.updateByIdFilter(user);
}
+ Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
- for (String s : model.getDeptIds().split(",")) {
+ for (Integer s : model.getDeptIds()) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(Integer.parseInt(s));
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
userDepartmentMapper.insert(userDepartment);
}
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
@@ -155,7 +158,6 @@
}}
).collect(Collectors.toList()));
}
- user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -227,12 +229,6 @@
}
return RestResponse.ok();
- }
-
- @RequestMapping(value = "/setStatus", method = RequestMethod.POST)
- public RestResponse<String> setStatus(@RequestBody UserVO user) {
- userService.setStatus(user);
- return RestResponse.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0