From c03a3b2ed3a371aea080429a4e3c73aa4144120e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 11:07:55 +0900
Subject: [PATCH] - 하위이슈 직접 추가하는 기능 - 이슈 추가 시 ISP,호스팅 정보 추가 안되는 문제 해
---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 54a9c67..6689f61 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -368,8 +368,7 @@
// 愿�由ъ옄�씪 �븣
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(condition);
totalCount = this.projectMapper.countByWorkspaceManager(condition);
}
@@ -1083,7 +1082,7 @@
projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
projectCondition.setProjectType(projectType);
projectCondition.setStatuses(statuses);
-
+ this.SetMyDepartmentId(projectCondition);
return this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
@@ -1092,6 +1091,7 @@
public List<Map<String, Object>> findByWorkspaceIdAndIncludeProject(ProjectCondition projectCondition) {
projectCondition.setLoginUserId(this.webAppUtil.getLoginId());
projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ this.SetMyDepartmentId(projectCondition);
return this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
@@ -1137,10 +1137,10 @@
List<Map<String, Object>> results;
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
} else {
+ this.SetMyDepartmentId(projectCondition);
results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
List<ProjectVo> projectVos = this.makeProjectByVos(results);
@@ -1175,8 +1175,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
}
else {
--
Gitblit v1.8.0