~qirong/qyksxt.git

			@@ -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;


			@@ -53,9 +50,7 @@
			@RequestMapping(value = "/page/list", method = RequestMethod.POST)
			public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
			model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
			PageInfo<User> pageInfo = userService.userPage(model);
			PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
			UserResponseVM.from(d));
			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<>();
			@@ -87,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 = "";
			@@ -96,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);
			}

			@@ -140,15 +136,23 @@
			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(",")) {
			UserDepartment userDepartment = new UserDepartment();
			userDepartment.setUserId(user.getId());
			userDepartment.setDepartmentId(Integer.parseInt(s));
			userDepartmentMapper.insert(userDepartment);
			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);
			}
			}
			tagService.removeUserTagByUserId(user.getId());
			if (ObjectUtils.isNotEmpty(model.getTagIds())) {
			tagService.removeUserTagByUserId(user.getId());
			tagService.saveBatchUserTag(model.getTagIds().stream().map(
			tagId -> new UserTag() {{
			setUserId(user.getId());
			@@ -156,7 +160,6 @@
			}}
			).collect(Collectors.toList()));
			}
			user.setDeptIds(model.getDeptIds());
			return RestResponse.ok(user);
			}

			@@ -185,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();
			@@ -230,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));
			}

			}