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


@@ -17,9 +17,8 @@


import kr.wisestone.owl.util.*;


import kr.wisestone.owl.vo.*;


import kr.wisestone.owl.web.condition.UserCondition;


import kr.wisestone.owl.web.form.DepartmentManagementForm;


import kr.wisestone.owl.web.form.DepartmentManageForm;


import kr.wisestone.owl.web.form.UserForm;


import kr.wisestone.owl.web.form.UserLevelForm;


import kr.wisestone.owl.web.view.ExcelView;


import org.apache.commons.validator.routines.EmailValidator;


import org.slf4j.Logger;


@@ -34,7 +33,6 @@


import org.springframework.security.core.session.SessionRegistry;


import org.springframework.security.core.userdetails.UserDetails;


import org.springframework.security.crypto.password.PasswordEncoder;


import org.springframework.stereotype.Repository;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.ui.Model;


@@ -61,7 +59,7 @@


    private UserLevelService userLevelService;




    @Autowired


    private DepartmentManagementService departmentManagementService;


    private DepartmentManageService departmentManageService;




    @Autowired


    private SystemRoleService systemRoleService;


@@ -227,7 +225,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,13 +237,17 @@


            UserLevel userLevel = this.userLevelService.addSuperUserLevel();


            user.setUserLevel(userLevel);




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


            DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();


            this.userLevelService.addNormalAdminUserLevel();




            departmentManagementForm.setDepartmentName("개발팀");


            departmentManagementForm.setDepartmentDescription("웹사이트 및 앱 서비스 개발");


            DepartmentManagement departmentManagement = this.departmentManagementService.addDepartment(departmentManagementForm);


            user.setDepartmentId(departmentManagement);


            this.userLevelService.addNormalUserLevel();




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


            DepartmentManageForm departmentManageForm = new DepartmentManageForm();




            departmentManageForm.setDepartmentName("개발팀");


            departmentManageForm.setDepartmentDescription("웹사이트 및 앱 서비스 개발");


            DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);


            user.setDepartmentManage(departmentManage);




            if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {


                //  업무 공간를 생성한다. 가입한 사용자는 업무 공간의 주인이다.


@@ -1027,6 +1030,7 @@


        this.userRepository.saveAndFlush(user);


    }




    //  삭제 할 등급명을 유저가 사용하고 있는지 확인


    @Override


    public boolean useUserLevel(Long levelId) {


        return this.userMapper.findByLevelId(levelId) > 0;


@@ -1068,7 +1072,7 @@


    @Override


    @Transactional(readOnly = true)


    public List<User> findAdmin() {


        return this.userRepository.findAdmin();


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


    }




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


@@ -1192,7 +1196,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()));