xiangpei
2024-05-27 6dc4345f9c84d829566ae1632477f11c22fac2f5
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;
@@ -96,6 +93,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,11 +138,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 (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);
        }
        if (ObjectUtils.isNotEmpty(model.getTagIds())) {