From 4356da2b030443f74c25335ad60b9f3c40f5b789 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 09:55:54 +0900
Subject: [PATCH] 이슈 하위이슈 삭제버튼, 최고관리자인데 수정 권한이 없는 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
index f8657be..d96c484 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -79,7 +79,7 @@
public List<UserWorkspaceVo> findUserWorkspace(Map<String, Object> resJsonData,
UserWorkspaceCondition condition, Pageable pageable) {
- UserWorkspace userWorkspace = this.findMyWorkspace(this.webAppUtil.getLoginId());
+ UserWorkspace userWorkspace = this.findWorkspaceManager(this.webAppUtil.getLoginId());
Workspace myWorkspace = userWorkspace.getWorkspace();
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
@@ -172,10 +172,10 @@
public void disabledUserWorkspace(User user, Workspace workspace) {
UserWorkspace userWorkspace = this.userWorkspaceRepository.findByUserIdAndWorkspaceId(user.getId(), workspace.getId());
- if (userWorkspace.getManagerYn()) {
+ /*if (userWorkspace.getManagerYn()) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.WORKSPACE_MANAGER_NOT_CHANGE_USE_YN));
- }
+ }*/
userWorkspace.setUseYn(false);
this.userWorkspaceRepository.saveAndFlush(userWorkspace);
@@ -216,6 +216,13 @@
return this.userWorkspaceRepository.findByUserIdAndManagerYn(userId, true);
}
+ // �썙�겕�뒪�럹�씠�뒪 愿�由ъ옄 議고쉶
+ @Override
+ @Transactional(readOnly = true)
+ public UserWorkspace findWorkspaceManager(Long userId) {
+ return this.userWorkspaceRepository.findByUserId(userId);
+ }
+
// �뾽臾� 怨듦컙 �궗�슜�옄 �뿰寃� �븘�씠�뵒濡� �뾽臾� 怨듦컙 �궗�슜�옄 �뿰寃� �젙蹂대�� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
--
Gitblit v1.8.0