From a3ffe41935c3859e88f91b525dbd591c9b1fa1cb Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 05 12월 2021 17:43:14 +0900
Subject: [PATCH] - api 수정시 이슈 상태만 수정 가능하도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 df9aac1..418273c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -5,10 +5,7 @@
import kr.wisestone.owl.common.MessageAccessor;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.IssueStatus;
-import kr.wisestone.owl.domain.Project;
-import kr.wisestone.owl.domain.ProjectClosure;
-import kr.wisestone.owl.domain.UserDepartment;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueMapper;
@@ -166,9 +163,10 @@
@Override
@Transactional(readOnly = true)
public WidgetCondition makeWidgetCondition() {
+ User user = this.webAppUtil.getLoginUserObject();
// �빐�떦 �썙�겕�뒪�럹�씠�뒪�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃 以� �긽�깭媛� �삤�뵂�씤 �봽濡쒖젥�듃
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
projects = this.projectService.findByWorkspaceManagerAll();
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(Lists.newArrayList("02"), ProjectType.BTS_PROJECT.toString());
@@ -277,9 +275,11 @@
public void findProjectProgress(Map<String, Object> resJsonData, WidgetCondition widgetCondition) {
List<Map<String, Object>> progressingProjectDetails = Lists.newArrayList();
+ User user = this.webAppUtil.getLoginUserObject();
+
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
progressingProjectDetails = this.widgetMapper.findProjectProgress(widgetCondition);
--
Gitblit v1.8.0