Merge remote-tracking branch 'origin/master'

jhjang

2021-11-15 b31979feb926bad9e0070332fb5ed7a896fd378d

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

@@ -12,6 +12,7 @@
import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserMapper;
import kr.wisestone.owl.repository.DepartmentRepository;
import kr.wisestone.owl.repository.UserRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.*;
@@ -54,6 +55,9 @@

    @Autowired
    private UserRepository userRepository;

    @Autowired
    private DepartmentRepository departmentRepository;

    @Autowired
    private UserLevelService userLevelService;
@@ -232,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();
@@ -259,13 +270,6 @@
                /*user.setPermission(MngPermission.makeSubAllPermission());*/
            }
        }

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

        this.userRepository.saveAndFlush(user);

        //  이메일 알림 예정 시간이 공백이면 디폴트 이메일 알림 예정 시간으로 설정한다.
@@ -1195,7 +1199,7 @@
    @Transactional(readOnly = true)
    public User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest) {
        User user = this.getUser(this.webAppUtil.getLoginId());
        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission"); // wyu - ignores permission ??
        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission");
        // user에서 Permission 값을 가져와서 userVo 에 setPermission 함
        userVo.setPermission(user.getPermission());
        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));