From d4baca463f7d9459d137c53139cf415c78642bf3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 17:03:49 +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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 0ecc5fb..a0a8824 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -34,6 +34,7 @@
private String projectType;
private String deep;
private Long parentIssueId; // �긽�쐞 �씪媛�
+ private String useValue;
private List<Long> projectIds = Lists.newArrayList();
private List<Long> issueStatusIds = Lists.newArrayList();
private List<Long> issueTypeIds = Lists.newArrayList();
@@ -43,7 +44,6 @@
private List<Long> departmentIds = Lists.newArrayList();
private List<Long> registerIds = Lists.newArrayList();
private List<String> issueIds = Lists.newArrayList(); // �씠�뒋 紐⑸줉 寃��깋�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶濡� 1李� 寃��깋�븳 寃곌낵瑜� �떞�쓣�븣 �궗�슜
- private List<String> userCustomFields = Lists.newArrayList();
private List<Map<String, Object>> issueCustomFields = Lists.newArrayList();
private List<Map<String, Object>> issueCompanyField = Lists.newArrayList();
private List<Map<String, Object>> issueIspField = Lists.newArrayList();
@@ -166,6 +166,10 @@
if (MapUtil.getLongs(conditions, "excludeIds") != null) {
condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
+ }
+
+ if (MapUtil.getLong(conditions, "issueId") != null) {
+ condition.setId(MapUtil.getLong(conditions, "issueId"));
}
return condition;
@@ -455,11 +459,11 @@
this.parentIssueId = parentIssueId;
}
- public List<String> getUserCustomFields() {
- return userCustomFields;
+ public String getUseValue() {
+ return useValue;
}
- public void setUserCustomFields(List<String> userCustomFields) {
- this.userCustomFields = userCustomFields;
+ public void setUseValue(String useValue) {
+ this.useValue = useValue;
}
}
--
Gitblit v1.8.0