From b90cdc67fa2c27ecd0f0b091bb5abe2624312f05 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 17:46:31 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 37ef059..ef50823 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -1121,6 +1121,7 @@
@Transactional(readOnly = true)
public List<ProjectVo> findByIncludeProject(List<String> statuses, String projectType) {
User user = this.webAppUtil.getLoginUserObject();
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
ProjectCondition projectCondition = new ProjectCondition();
projectCondition.setLoginUserId(user.getId());
@@ -1130,7 +1131,8 @@
List<Map<String, Object>> results;
- if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
} else {
results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
--
Gitblit v1.8.0