Merge remote-tracking branch 'origin/master'

jhjang

2021-11-15 b31979feb926bad9e0070332fb5ed7a896fd378d

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

@@ -237,11 +237,11 @@

        } else if(validAdmin == 1) {    // 라이센스 입력 관리자

            DepartmentForm departmentForm = new DepartmentForm();
            /*DepartmentForm departmentForm = new DepartmentForm();

            departmentForm.setDepartmentName("부서 없음");
            Department department = this.departmentService.add(departmentForm);
            this.departmentRepository.saveAndFlush(department);
            this.departmentRepository.saveAndFlush(department);*/

            Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();