부서관리 테이블 변경 및 언어팩 수정

wyu

2021-11-05 a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a

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

@@ -2,17 +2,11 @@

import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.domain.UserWorkspace;
import kr.wisestone.owl.domain.Workspace;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserWorkspaceMapper;
import kr.wisestone.owl.repository.UserWorkspaceRepository;
import kr.wisestone.owl.service.UserLevelService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.service.UserWorkspaceService;
import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.ResPage;
@@ -44,6 +38,9 @@

    @Autowired
    private UserLevelService userLevelService;

    @Autowired
    private DepartmentManageService departmentManageService;

    @Autowired
    private UserWorkspaceMapper userWorkspaceMapper;
@@ -119,6 +116,14 @@
        }

        //todo 부서 변경시
        DepartmentManage currentDepartment = userWorkspace.getUser().getDepartmentManage();
        if (currentDepartment.getId() != userWorkspaceForm.getDepartmentId()) {
            // 부서명 변경시
            User user = userWorkspace.getUser();
            DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getLevelId());
            user.setDepartmentManage(departmentManage);
            userWorkspace.setUser(user);
        }

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