From a9277be576a7b76de9bfbaf5e83cd6d6407dbd98 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 17 11월 2021 11:14:57 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java index 36b2936..e906deb 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java @@ -236,6 +236,13 @@ /*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/ } else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄 + + /*DepartmentForm departmentForm = new DepartmentForm(); + + departmentForm.setDepartmentName("遺��꽌 �뾾�쓬"); + Department department = this.departmentService.add(departmentForm); + this.departmentRepository.saveAndFlush(department);*/ + Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace(); UserLevel userLevel = this.userLevelService.addSuperUserLevel(); @@ -263,13 +270,6 @@ /*user.setPermission(MngPermission.makeSubAllPermission());*/ } } - DepartmentForm departmentForm = new DepartmentForm(); - - departmentForm.setDepartmentName("遺��꽌 �뾾�쓬"); - Department department = this.departmentService.add(departmentForm); - - // wyu - this.departmentRepository.saveAndFlush(department); this.userRepository.saveAndFlush(user); // �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎. -- Gitblit v1.8.0