백앤드 수정

wyu

2021-11-09 6dac8557d8858abe8ed3252f1e4ddf8447538560

 src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java

@@ -40,7 +40,7 @@
    private UserLevelService userLevelService;

    @Autowired
    private DepartmentManageService departmentManageService;
    private DepartmentService departmentService;

    @Autowired
    private UserWorkspaceMapper userWorkspaceMapper;
@@ -117,13 +117,13 @@
        }

        // 부서 변경
        DepartmentManage currentDepartment = user.getDepartmentManage();
        if (currentDepartment == null || (userWorkspaceForm.getDepartmentId() != null && currentDepartment.getId() != userWorkspaceForm.getDepartmentId())) {
            // 부서명 변경시
            DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getDepartmentId());
            user.setDepartmentManage(departmentManage);
            userWorkspace.setUser(user);
        }
//        DepartmentManage currentDepartment = user.getDepartmentManage();
//        if (currentDepartment == null || (userWorkspaceForm.getDepartmentId() != null && currentDepartment.getId() != userWorkspaceForm.getDepartmentId())) {
//            // 부서명 변경시
//            DepartmentManage departmentManage = this.departmentService.getDepartment(userWorkspaceForm.getDepartmentId());
//            user.setDepartmentManage(departmentManage);
//            userWorkspace.setUser(user);
//        }

        //  참여로 상태를 변경하려고 할때
        if (userWorkspace.getUseYn() != userWorkspaceForm.getUseYn()) {