From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 8533bb5..b192044 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());
@@ -126,6 +126,12 @@
UserLevel userLevel = this.userLevelService.getUserLevel(userWorkspaceForm.getLevelId());
user.setUserLevel(userLevel);
userWorkspace.setUser(user);
+
+ // �벑湲� 蹂�寃� �맂 �쑀�� 濡쒓렇�븘�썐 �떆�궎湲�
+ this.simpMessagingTemplate.convertAndSendToUser(user.getAccount(), "/notification/changeUserLevel", this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_CHANGE));
+
+ // �꽭�뀡 �뾽�뜲�씠�듃
+ //SecurityUtils.setUserToSession(user);
}
// 遺��꽌 蹂�寃�
@@ -213,7 +219,13 @@
@Override
@Transactional(readOnly = true)
public UserWorkspace findMyWorkspace(Long userId) {
- //return this.userWorkspaceRepository.findByUserIdAndManagerYn(userId, true);
+ return this.userWorkspaceRepository.findByUserIdAndManagerYn(userId, true);
+ }
+
+ // �썙�겕�뒪�럹�씠�뒪 愿�由ъ옄 議고쉶
+ @Override
+ @Transactional(readOnly = true)
+ public UserWorkspace findWorkspaceManager(Long userId) {
return this.userWorkspaceRepository.findByUserId(userId);
}
--
Gitblit v1.8.0