- API 수정 명령시 댓글 추가 가능(comment) - API 이슈 입력시 상위 이슈에 같은 도메인 업체 등록되도록 수정

이민희

2022-01-04 34351d822ce35efe2488004e586beeb074fbe5ae

 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())); //  추가 결제를 진행할 때 금액 계산을 위해 사용
@@ -562,6 +567,15 @@
    //  사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
    @Override
    @Transactional
    public void checkUseWorkspace(User user) {
        Workspace workspace = this.getWorkspace(user.getLastWorkspaceId());

        this.checkUseWorkspace(user, workspace.getId());
    }

    //  사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
    @Override
    @Transactional
    public Workspace checkUseWorkspace(User user, Long workspaceId) {
        if (user == null) {
            throw new OwlRuntimeException(