OWL ITS + 탐지시스템(인터넷 진흥원)
blame | 히스토리 | 패치 | 커밋 | 커밋비교 | ignore whitespace
wyu
2021-11-03 8abf5efd48aba1cfc101966bd4f420e463d41dcd 
 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java


@@ -42,6 +42,7 @@


import org.springframework.web.multipart.MultipartFile;


import org.springframework.web.servlet.ModelAndView;




import javax.rmi.CORBA.Util;


import javax.servlet.http.HttpServletRequest;


import java.io.*;


import java.net.HttpURLConnection;


@@ -227,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);*/


@@ -237,6 +239,10 @@




            UserLevel userLevel = this.userLevelService.addSuperUserLevel();


            user.setUserLevel(userLevel);




            this.userLevelService.addNormalAdminUserLevel();




            this.userLevelService.addNormalUserLevel();




            // DepartmentManagement에 임시로 Name, Description 값 추가


            DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();


@@ -1069,7 +1075,7 @@


    @Override


    @Transactional(readOnly = true)


    public List<User> findAdmin() {


        return this.userRepository.findAdmin();


        return this.userRepository.findAdmin(MngPermission.makeAllPermission());


    }




    //  해당 사용자가 관리하는 업무 공간을 마지막으로 접근한 업무 공간 정보로 업데이트한다.


@@ -1193,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()));