defaultYn 추가 basicUser 추가 엑셀, 상세조회 진행중 일반회원 조회 추가 V1_10 Table 변경(데이터 삭제후 진행)

wyu

2021-11-03 8abf5efd48aba1cfc101966bd4f420e463d41dcd

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

@@ -228,7 +228,8 @@

            this.userInviteService.includePrimaryWorkspace(user, primaryWorkspace);


            UserLevel userLevel = this.userLevelService.getBasicUserLevel();
            user.setUserLevel(userLevel);

            // edit by zenith for permission at 20200803
            /*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/
@@ -238,6 +239,10 @@

            UserLevel userLevel = this.userLevelService.addSuperUserLevel();
            user.setUserLevel(userLevel);

            this.userLevelService.addNormalAdminUserLevel();

            this.userLevelService.addNormalUserLevel();

            // DepartmentManagement에 임시로 Name, Description 값 추가
            DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
@@ -1194,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");
        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission"); // wyu - ignores permission ??
        // user에서 Permission 값을 가져와서 userVo 에 setPermission 함
        userVo.setPermission(user.getPermission());
        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));