"사용자 관리" 프론트 수정

이민희

2021-11-04 2a0ad29f00b70e7a4576c6c870d10a894615b201

 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);*/
@@ -235,14 +237,12 @@
        } else if(validAdmin == 1) {    // 라이센스 입력 관리자
            Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();

            // UserLevel에 Permission 값 넣어줌
            UserLevelForm userLevelForm = new UserLevelForm();
            // Constants 에서 ADMIN 값 추가
            userLevelForm.setLevelName(Constants.ADMIN_MANAGER);
            // Permission 값 추가
            userLevelForm.setPermission(MngPermission.makeAllPermission());
            UserLevel userLevel = this.userLevelService.addUserLevel(userLevelForm);
            UserLevel userLevel = this.userLevelService.addSuperUserLevel();
            user.setUserLevel(userLevel);

            this.userLevelService.addNormalAdminUserLevel();

            this.userLevelService.addNormalUserLevel();

            // DepartmentManagement에 임시로 Name, Description 값 추가
            DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();
@@ -1033,6 +1033,12 @@
        this.userRepository.saveAndFlush(user);
    }

    //  삭제 할 등급명을 유저가 사용하고 있는지 확인
    @Override
    public boolean useUserLevel(Long levelId) {
        return this.userMapper.findByLevelId(levelId) > 0;
    }

    //  마지막으로 선택한 프로젝트 정보를 저장한다.
    @Override
    @Transactional
@@ -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()));