From 1bf54ac4463cc9a821bb818f6c8cfb01d981e91a Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 23 12월 2021 15:51:29 +0900 Subject: [PATCH] - '이슈관리' 권한은 내가 속해있는 프로젝트의 이슈에 대해서만 관리 권한이 있음 - 일반 사용자 검색 문제 해결 - 이슈리스트 툴팁 재추가 --- src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java index fcddc53..23b0d61 100644 --- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java +++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java @@ -53,7 +53,8 @@ private List<Long> statusIds = Lists.newArrayList(); private List<Long> excludeIds = Lists.newArrayList(); private List<Long> myDepartmentIds; // �궡媛� �냽�빐�엳�뒗 遺��꽌 ID - private Boolean hideIssue; + private Boolean hideDownIssue; + private Boolean hideCompleteIssue; private Boolean isTree; // �듃由ш뎄議� 紐⑤뱶 �씪�븣 public IssueCondition(){} @@ -181,8 +182,16 @@ condition.setId(MapUtil.getLong(conditions, "issueId")); } - if (MapUtil.getBoolean(conditions, "hideIssue") != null) { - condition.setHideIssue(MapUtil.getBoolean(conditions, "hideIssue")); + if (MapUtil.getBoolean(conditions, "hideDownIssue") != null) { + if(MapUtil.getBoolean(conditions, "isTree") != null && !MapUtil.getBoolean(conditions, "isTree")){ + condition.setHideDownIssue(MapUtil.getBoolean(conditions, "hideDownIssue")); + }else if(MapUtil.getBoolean(conditions, "isTree")) { + condition.setHideDownIssue(false); + } + } + + if (MapUtil.getBoolean(conditions, "hideCompleteIssue") != null) { + condition.setHideCompleteIssue(MapUtil.getBoolean(conditions, "hideCompleteIssue")); } if (MapUtil.getBoolean(conditions, "isTree") != null) { @@ -510,12 +519,20 @@ this.myDepartmentIds = myDepartmentIds; } - public Boolean getHideIssue() { - return hideIssue; + public Boolean getHideDownIssue() { + return hideDownIssue; } - public void setHideIssue(Boolean hideIssue) { - this.hideIssue = hideIssue; + public void setHideDownIssue(Boolean hideDownIssue) { + this.hideDownIssue = hideDownIssue; + } + + public Boolean getHideCompleteIssue() { + return hideCompleteIssue; + } + + public void setHideCompleteIssue(Boolean hideCompleteIssue) { + this.hideCompleteIssue = hideCompleteIssue; } public Boolean getTree() { -- Gitblit v1.8.0