From a9277be576a7b76de9bfbaf5e83cd6d6407dbd98 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 17 11월 2021 11:14:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
index 7de6096..bb42b03 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
@@ -1,6 +1,7 @@
 package kr.wisestone.owl.web.condition;
 
 import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
 
 import java.util.Map;
 
@@ -13,12 +14,17 @@
     private Integer page;
     private Integer pageSize;
     private Long workspaceId;
+    private Long projectId;
     private String deep;    //  �긽�꽭 議고쉶�뿉�꽌 媛��졇�삱 �뜲�씠�꽣�쓽 醫낅쪟瑜� 寃곗젙�븳�떎.
+    private boolean UseProject = false;     // �봽濡쒖젥�듃�뿉�꽌 �궗�슜以묒씤 �씠�뒋���엯�쓣 媛��졇�삱�븣 �궗�슜
 
     public IssueTypeCondition(){}
 
-    public static IssueTypeCondition make(Map<String, Object> conditions) {
-        IssueTypeCondition condition = ConvertUtil.convertMapToClass(conditions, IssueTypeCondition.class);
+    public static IssueTypeCondition make(Map<String, Object> params) {
+        IssueTypeCondition condition = ConvertUtil.convertMapToClass(params, IssueTypeCondition.class);
+        if (MapUtil.getString(params, "useProject") != null) {
+            condition.setUseProject(MapUtil.getBoolean(params, "useProject"));
+        }
         return condition;
     }
 
@@ -69,4 +75,20 @@
     public void setDeep(String deep) {
         this.deep = deep;
     }
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public boolean isUseProject() {
+        return UseProject;
+    }
+
+    public void setUseProject(boolean useProject) {
+        UseProject = useProject;
+    }
 }

--
Gitblit v1.8.0