From a792396d2e2573419cc7308ede32f84b4578d6e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 13:32:19 +0900
Subject: [PATCH] 이슈 Tree 목록 중복 이슈 필터링 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 1fc09fc..d96c484 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -9,8 +9,10 @@
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.vo.DepartmentVo;
import kr.wisestone.owl.vo.ResPage;
import kr.wisestone.owl.vo.UserWorkspaceVo;
+import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserWorkspaceCondition;
import kr.wisestone.owl.web.form.UserWorkspaceForm;
import org.slf4j.Logger;
@@ -77,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());
@@ -91,6 +93,16 @@
for (UserWorkspaceVo userWorkspaceVo : userWorkspaceVos) {
userWorkspaceVo.setAccount(CommonUtil.decryptAES128(userWorkspaceVo.getAccount()));
+
+ // UserCondition �뒗 �썝�옒 userId 媛� �뾾�뿀�떎.
+ UserCondition con = new UserCondition();
+ // 洹몃옒�꽌 Condition�뿉 異붽� �빐二쇨퀬 set �븯�뒗�뜲 洹멸굔 userWorkspaceVo �뿉�꽌 Id 瑜� 媛��졇�삩�떎
+ con.setId(userWorkspaceVo.getUserId());
+ // findByDepartmentIds �씪�뒗嫄� mapper濡� 留뚮뱾�뼱�꽌 荑쇰━ for臾몄쓣 �룎由ш퀬 us
+ List<Map<String, Object>> re = this.departmentService.findByDepartmentIds(con);
+ List<DepartmentVo> vos = ConvertUtil.convertListToListClass(re, DepartmentVo.class);
+
+ userWorkspaceVo.setDepartmentVos(vos);
}
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
@@ -160,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);
@@ -204,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)
@@ -226,15 +245,14 @@
// �뾽臾� 怨듦컙 �떞�떦�옄 �뿬遺�瑜� �솗�씤�븳�떎.
@Override
@Transactional(readOnly = true)
- public boolean checkWorkspaceManager() {
+ public boolean checkWorkspaceManager(User user) {
boolean bIsManager = false;
- User loginUser = this.userService.getUser(this.webAppUtil.getLoginId());
try
{
- Workspace workspace = this.workspaceService.getWorkspace(loginUser.getLastWorkspaceId()); // �쁽�옱 �젒�냽�븳 �뾽臾� 怨듦컙
+ Workspace workspace = this.workspaceService.getWorkspace(user.getLastWorkspaceId()); // �쁽�옱 �젒�냽�븳 �뾽臾� 怨듦컙
// 濡쒓렇�씤�븳 �궗�슜�옄媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙�쓣 李얜뒗�떎.
- UserWorkspace userWorkspace = this.findMyWorkspace(this.webAppUtil.getLoginId());
+ UserWorkspace userWorkspace = this.findMyWorkspace(user.getId());
bIsManager = workspace.getId().equals(userWorkspace.getWorkspace().getId());
}
--
Gitblit v1.8.0