From 41c8f3c976c0d8ec4b0a6ad3d7f4ce90a9de03c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 21:19:22 +0900
Subject: [PATCH] 프로젝트 담당부서 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
index a175487..dc6204a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -71,21 +71,23 @@
@Override
public UserLevel addUserLevel(UserLevelForm userLevelForm) {
userLevelForm.makePermission();
+ userLevelForm.setDefaultYn(UserLevel.YN_FIELD_NO);
+ userLevelForm.setBasicUser(UserLevel.YN_FIELD_NO);
UserLevel userLevel = ConvertUtil.copyProperties(userLevelForm, UserLevel.class);
userLevelRepository.saveAndFlush(userLevel);
return userLevel;
}
@Override
public UserLevel addSuperUserLevel() {
- return addUserLevel("理쒓퀬愿�由ъ옄", MngPermission.makeAllPermission(),"Y", "N");
+ return addUserLevel("理쒓퀬愿�由ъ옄", MngPermission.makeAllPermission(),UserLevel.YN_FIELD_YES,UserLevel.YN_FIELD_NO);
}
public UserLevel addNormalUserLevel() {
- return addUserLevel("�씪諛섑쉶�썝", 0,"Y" , "Y");
+ return addUserLevel("�씪諛섑쉶�썝", 0,UserLevel.YN_FIELD_YES , UserLevel.YN_FIELD_YES);
}
public UserLevel addNormalAdminUserLevel() {
- return addUserLevel("�씪諛섍�由ъ옄", MngPermission.makeSubAllPermission(),"N", "N");
+ return addUserLevel("�씪諛섍�由ъ옄", MngPermission.makeSubAllPermission(),UserLevel.YN_FIELD_NO, UserLevel.YN_FIELD_NO);
}
// �궗�슜�옄 �벑湲� 異붽�
@@ -171,7 +173,7 @@
public void removeUserLevel(UserLevelForm userLevelForm) {
if (userLevelForm.getRemoveIds().size() < 1) {
throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
+ this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_REMOVE_NOT_SELECT));
}
// 湲곕낯 �궗�슜�옄 �벑湲� �궘�젣 泥댄겕
@@ -211,7 +213,7 @@
return userLevelVos;
}
- // �궗�슜�옄 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ // �궗�슜�옄�벑湲� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
@@ -234,13 +236,14 @@
vo.toPermissionValues();
}
+ // code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("�궗�슜�옄 紐⑸줉"));
excelInfo.addAttrInfos(new ExportExcelAttrVo("levelName", this.messageAccessor.message("managementWorkspace.levelName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permWorkSpaceSetting", this.messageAccessor.message("manageUser.manageWorkspacePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permProjectSetting", this.messageAccessor.message("manageUser.manageProjectPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSetting", this.messageAccessor.message("manageUser.manageIssueSystemPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("permUser", this.messageAccessor.message("manageUser.manageUserPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permApi", this.messageAccessor.message("manageUser.manageUserApi"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permNotice", this.messageAccessor.message("manageUser.manageNoticePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permFAQ", this.messageAccessor.message("manageUser.manageFAQPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permQnA", this.messageAccessor.message("manageUser.manageQnAPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
@@ -252,5 +255,31 @@
return new ModelAndView(this.excelView);
}
+ // �궗�슜�옄 �벑湲� �긽�깭瑜� 蹂�寃쏀븳�떎.
+ @Override
+ public void modifyLevelPermission(UserLevelForm userLevelForm) {
+ int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
+ 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.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);
+ }
}
--
Gitblit v1.8.0