From 11e27ddf54f5b4e2310591f74e8dd446e65a18ac Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 2월 2022 14:31:37 +0900
Subject: [PATCH] 이슈 엑셀 임포트시 상위이슈 null 체크 및 코드 보완

---
 src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 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 74c96ee..ae863c5 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -57,6 +57,9 @@
     private Boolean isTree; // �듃由ш뎄議� 紐⑤뱶 �씪�븣
     private Pageable relPageable;
     private Pageable downPageable;
+    private Boolean allIssue; // �쟾泥댁씠�뒋 蹂댁뿬二쇨린
+    private Long issueTypeId;
+    private Boolean parentYN;   //�긽�쐞�씠�뒋留� 議고쉶 �쑀臾�
 
     public IssueCondition(){}
 
@@ -169,6 +172,10 @@
             condition.setIssueTypeIds(MapUtil.getLongs(conditions, "issueTypeIds"));
         }
 
+        if (MapUtil.getLong(conditions, "issueTypeId") != null) {
+            condition.setIssueTypeId(MapUtil.getLong(conditions, "issueTypeId"));
+        }
+
         if (MapUtil.getLongs(conditions, "priorityIds") != null) {
             condition.setPriorityIds(MapUtil.getLongs(conditions, "priorityIds"));
         }
@@ -213,6 +220,10 @@
             condition.setTree(MapUtil.getBoolean(conditions, "isTree"));
         } else {
             condition.setTree(false);
+        }
+
+        if (MapUtil.getBoolean(conditions, "parentYN") != null && MapUtil.getBoolean(conditions, "parentYN")) {
+            condition.setParentYN(true);
         }
 
         return condition;
@@ -573,4 +584,28 @@
     public void setDownPageable(Pageable downPageable) {
         this.downPageable = downPageable;
     }
+
+    public Boolean getAllIssue() {
+        return allIssue;
+    }
+
+    public void setAllIssue(Boolean allIssue) {
+        this.allIssue = allIssue;
+    }
+
+    public Long getIssueTypeId() {
+        return issueTypeId;
+    }
+
+    public void setIssueTypeId(Long issueTypeId) {
+        this.issueTypeId = issueTypeId;
+    }
+
+    public Boolean getParentYN() {
+        return parentYN;
+    }
+
+    public void setParentYN(Boolean parentYN) {
+        this.parentYN = parentYN;
+    }
 }

--
Gitblit v1.8.0