From df9eb84a3d87abfc68fb7ba0bc7700d760a8157f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 14:17:11 +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