From 17cc6df86e0325229ec2b9d561a17bc6b909f4bb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 24 12월 2021 09:02:46 +0900
Subject: [PATCH] 사용자 정의 필드 필수 항목 표시 변경 수정
---
src/main/java/kr/wisestone/owl/service/impl/WorkspaceServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WorkspaceServiceImpl.java
index 6e6e880..398de47 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WorkspaceServiceImpl.java
@@ -300,8 +300,13 @@
@Override
@Transactional(readOnly = true)
public void findMyWorkspace(Map<String, Object> resJsonData) {
- UserWorkspace userWorkspace = this.userWorkspaceService.findMyWorkspace(this.webAppUtil.getLoginId());
+
+ UserWorkspace userWorkspace = this.userWorkspaceService.findWorkspaceManager(this.webAppUtil.getLoginId()); //�썙�겕�뒪�럹�씠�뒪 愿�由ъ옄
+ if(userWorkspace == null){
+ userWorkspace = this.userWorkspaceService.findMyWorkspace(this.webAppUtil.getLoginId());
+ }
Workspace workspace = userWorkspace.getWorkspace();
+
WorkspaceVo workspaceVo = ConvertUtil.copyProperties(workspace, WorkspaceVo.class);
workspaceVo.setServiceType((workspace.getServiceType().toString()));
workspaceVo.setExpireDateTerm(DateUtil.getDateDiff(new Date(), workspace.getExpireDate())); // 異붽� 寃곗젣瑜� 吏꾪뻾�븷 �븣 湲덉븸 怨꾩궛�쓣 �쐞�빐 �궗�슜
--
Gitblit v1.8.0