From 16b795b0863f441d7b82dcee0fabc667bf54921f Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 16 12월 2021 10:01:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 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 c67133a..0113fcd 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,12 +182,18 @@
condition.setId(MapUtil.getLong(conditions, "issueId"));
}
- if (MapUtil.getBoolean(conditions, "hideIssue") != null) {
- condition.setHideIssue(MapUtil.getBoolean(conditions, "hideIssue"));
+ if (MapUtil.getBoolean(conditions, "hideDownIssue") != null) {
+ condition.setHideDownIssue(MapUtil.getBoolean(conditions, "hideDownIssue"));
+ }
+
+ if (MapUtil.getBoolean(conditions, "hideCompleteIssue") != null) {
+ condition.setHideCompleteIssue(MapUtil.getBoolean(conditions, "hideCompleteIssue"));
}
if (MapUtil.getBoolean(conditions, "isTree") != null) {
condition.setTree(MapUtil.getBoolean(conditions, "isTree"));
+ } else {
+ condition.setTree(false);
}
return condition;
@@ -508,12 +515,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