사용자 관리 백앤드 수정

wyu

2021-11-10 578590c0540eee79ccf3af069db71efaf6bc2bfc

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

@@ -17,7 +17,7 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentManageForm;
import kr.wisestone.owl.web.form.DepartmentForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
@@ -59,7 +59,7 @@
    private UserLevelService userLevelService;

    @Autowired
    private DepartmentManageService departmentManageService;
    private DepartmentService departmentService;

    @Autowired
    private SystemRoleService systemRoleService;
@@ -241,13 +241,6 @@

            this.userLevelService.addNormalUserLevel();

            // DepartmentManage에 임시로 Name, Description 값 추가
            DepartmentManageForm departmentManageForm = new DepartmentManageForm();

            departmentManageForm.setDepartmentName("부서 없음");
            DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
            user.setDepartmentManage(departmentManage);

            if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {
                //  업무 공간를 생성한다. 가입한 사용자는 업무 공간의 주인이다.
                Workspace workspace = this.workspaceService.addWorkspace(userForm.getWorkspaceName());
@@ -266,6 +259,13 @@
                /*user.setPermission(MngPermission.makeSubAllPermission());*/
            }
        }

//        DepartmentManageForm departmentManageForm = new DepartmentManageForm();
//
//        departmentManageForm.setDepartmentName("부서 없음");
//        DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
//        user.setDepartmentManage(departmentManage);

        this.userRepository.saveAndFlush(user);

        //  이메일 알림 예정 시간이 공백이면 디폴트 이메일 알림 예정 시간으로 설정한다.