From ee9cdbdf15ede4ed38b264c421ada71a959a0464 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 18:38:00 +0900
Subject: [PATCH] '이슈관리' 권한은 내가 속해있는 프로젝트의 이슈에 대해서만 관리 권한이 있음
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
index 9a28b83..3a61b01 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -168,9 +168,11 @@
@Transactional(readOnly = true)
public WidgetCondition makeWidgetCondition() {
User user = this.webAppUtil.getLoginUserObject();
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
// �빐�떦 �썙�겕�뒪�럹�씠�뒪�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃 以� �긽�깭媛� �삤�뵂�씤 �봽濡쒖젥�듃
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
projects = this.projectService.findByWorkspaceManagerAll();
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(Lists.newArrayList("02"), ProjectType.BTS_PROJECT.toString());
@@ -255,7 +257,8 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || (MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT) &&
+ MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE))) {
remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
@@ -300,7 +303,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
progressingProjectDetails = this.widgetMapper.findProjectProgress(widgetCondition);
@@ -400,6 +403,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+ this.SetMyDepartmentId(widgetCondition);
todayCount = this.widgetMapper.countTodayMyAssigneeIssue(widgetCondition);
assigneeIssues = this.widgetMapper.findMyAssigneeIssue(widgetCondition);
totalCount = this.widgetMapper.countMyAssigneeIssue(widgetCondition);
@@ -510,7 +514,7 @@
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> projectMemberIssues = Lists.newArrayList();
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
} else {
projectMemberIssues = this.widgetMapper.findProjectMemberIssueByDepartment(widgetCondition);
@@ -798,7 +802,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
}else {
results = this.widgetMapper.findByStandIssueStatusOfDepartment(widgetCondition);
@@ -832,7 +836,7 @@
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> issueTypeIssues = Lists.newArrayList();
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
} else {
issueTypeIssues = this.widgetMapper.findByStandIssueTypeOfDepartment(widgetCondition);
@@ -917,7 +921,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
severityCounts = this.widgetMapper.countSeverityIssue(widgetCondition);
severityIssues = this.widgetMapper.findSeverityIssues(widgetCondition);
totalCount = this.widgetMapper.countSearchIssue(widgetCondition);
--
Gitblit v1.8.0