From 9ff3e8c43d01f758381b4925cff44502f1241750 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 22 12월 2021 14:26:36 +0900 Subject: [PATCH] - 일반 사용자로 검색 기능 제대로 동작안되는 문제 해결 - 이슈 유형에서 사용중인 프로젝트는 삭제 불가 - 이슈 유형에서 프로젝트 검색 시 워크스페이스 관리자는 모든 프로젝트 검색 가능(기존엔 참여하고있는 프로젝트만 검색가능하게되어있었음) --- src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java b/src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java index 8b7e5dc..eb97a52 100644 --- a/src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java +++ b/src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java @@ -10,11 +10,18 @@ public class IssueTableConfig extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; + public static final int ISSUE_TABLE_TYPE_MAIN = 1; + public static final int ISSUE_TABLE_TYPE_REL = 2; + public static final int ISSUE_TABLE_TYPE_DOWN = 3; + + public static int[] IssueTableTypes = {ISSUE_TABLE_TYPE_MAIN, ISSUE_TABLE_TYPE_REL, ISSUE_TABLE_TYPE_DOWN}; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String issueTableConfigs; private int issueTableType; + private Long issueTypeId; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_id") @@ -23,10 +30,6 @@ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "issue_id") - private Issue issue; public IssueTableConfig(){} @@ -62,14 +65,6 @@ this.user = user; } - public Issue getIssue() { - return issue; - } - - public void setIssue(Issue issue) { - this.issue = issue; - } - public int getIssueTableType() { return issueTableType; } @@ -77,4 +72,12 @@ public void setIssueTableType(int issueTableType) { this.issueTableType = issueTableType; } + + public Long getIssueTypeId() { + return issueTypeId; + } + + public void setIssueTypeId(Long issueTypeId) { + this.issueTypeId = issueTypeId; + } } -- Gitblit v1.8.0