OWL ITS + 탐지시스템(인터넷 진흥원)
wyu
2021-11-12 0bf55ecf79413ab8eb62cff68cb489bd36af5ae1
사용자 등급관리 등급명, 등급권한 관련 오류 수정
5개 파일 변경됨
39 ■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/UserLevelService.java 2 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java 10 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java 12 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js 9 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js 6 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/UserLevelService.java
@@ -38,4 +38,6 @@
    ModelAndView downloadExcel(HttpServletRequest request, Model model);
    void modifyLevelPermission(UserLevelForm userLevelForm);
    void modifyLevelName(UserLevelForm make);
}
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -267,13 +267,19 @@
        newPermission |= MngPermission.makePermission(userLevelForm.getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);
        newPermission |= MngPermission.makePermission(userLevelForm.getPermEvent(), MngPermission.USER_PERMISSION_MNG_EVENT);
        /*newPermission |= MngPermission.makePermission(userLevelForm.getPermEvent(), MngPermission.USER_PERMISSION_MNG_EVENT);*/
        newPermission |= MngPermission.makePermission(userLevelForm.getPermGuide(), MngPermission.USER_PERMISSION_MNG_GUIDE);
        UserLevel userLevel = userLevelService.getUserLevel(userLevelForm.getId());
        /*        user.setPermission(newPermission);*/
        userLevel.setPermission(newPermission);
        this.userLevelRepository.saveAndFlush(userLevel);
    }
    @Override
    public void modifyLevelName(UserLevelForm userLevelForm) {
        UserLevel userLevel = userLevelService.getUserLevel(userLevelForm.getId());
        userLevel.setLevelName(userLevelForm.getLevelName());
        this.userLevelRepository.saveAndFlush(userLevel);
    }
}
src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
@@ -61,6 +61,18 @@
        return this.setSuccessMessage(resJsonData);
    }
    //  사용자등급명만 수정
    @RequestMapping(value = "/userLevel/nameModify", produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> nameModify(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();
        this.userLevelService.modifyLevelName(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));
        return this.setSuccessMessage(resJsonData);
    }
    //  사용자등급 수정
    @RequestMapping(value = "/userLevel/modify", produces = MediaType.APPLICATION_JSON_VALUE)
    public
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -22,7 +22,7 @@
                    id : parameter.id,
                    form : {
                        levelName : "",
                        permWorkspaceSetting : false,
                        permWorkSpaceSetting : false,
                        permProjectSetting : false,
                        permIssueSetting : false,
                        permApi : false,
@@ -63,16 +63,15 @@
                }
                //  폼 전송
                function formSubmit(condition) {
                function formSubmit() {
                    $rootScope.spinner = true;
                    var content = {
                        id : parameter.id,
                        title : $rootScope.preventXss($scope.vm.form.title),
                        //description : $rootScope.preventXss($scope.vm.form.description)
                        levelName : $rootScope.preventXss($scope.vm.form.levelName)
                    };
                    UserWorkspace.levelModify($resourceProvider.getContent(condition,
                    UserWorkspace.levelNameModify($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {
src/main/webapp/scripts/components/userWorkspace/userWorkspace.service.js
@@ -19,6 +19,12 @@
                    return response;
                });
            },
            levelNameModify : function (conditions) {
                return $http.post("userLevel/nameModify", conditions).then(function (response) {
                    $log.debug("사용자 등급 수정 결과 : ", response);
                    return response;
                });
            },
            levelModify : function (conditions) {
                return $http.post("userLevel/modify", conditions).then(function (response) {
                    $log.debug("사용자 등급 수정 결과 : ", response);