From 6ae9f3ab6d498f7a4d72c3fbbe8b90e6358f389b Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 21 12월 2021 13:31:54 +0900
Subject: [PATCH] 사용자 정의필드 시간형태 등호 변경

---
 src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java |   46 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 39 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 1a29c61..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,9 @@
     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(){}
 
@@ -180,8 +182,22 @@
             condition.setId(MapUtil.getLong(conditions, "issueId"));
         }
 
-        if (MapUtil.getBoolean(conditions, "hideIssue")) {
-            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) {
+            condition.setTree(MapUtil.getBoolean(conditions, "isTree"));
+        } else {
+            condition.setTree(false);
         }
 
         return condition;
@@ -503,11 +519,27 @@
         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() {
+        return isTree;
+    }
+
+    public void setTree(Boolean tree) {
+        isTree = tree;
     }
 }

--
Gitblit v1.8.0