From a5280304e375cf843a00eae56bd58a2c72a8d1ef Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 28 11월 2021 01:36:39 +0900
Subject: [PATCH] 이슈 상세 유형별 수정

---
 src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
index 33af7e6..815b458 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.Lists;
 import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,9 @@
     private String departmentName;
     private String departmentDescription;
     private Long departmentCount;
+    private Long projectId;
+
+    private List<Long> excludeIds = Lists.newArrayList();
 
     private List<Long> departmentIds = Lists.newArrayList();
 
@@ -21,7 +25,13 @@
     private Integer PageSize;
 
     public static DepartmentCondition make(Map<String, Object> departmentConditions) {
-        return ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
+        DepartmentCondition condition = ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
+
+        if (MapUtil.getStrings(departmentConditions, "excludeIds") != null) {
+            condition.setExcludeIds(MapUtil.getLongs(departmentConditions, "excludeIds"));
+        }
+
+        return condition;
     }
 
     public Long getId() {
@@ -56,6 +66,14 @@
         this.departmentCount = departmentCount;
     }
 
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
     public Integer getPage() {
         return Page;
     }
@@ -79,4 +97,12 @@
     public void setDepartmentIds(List<Long> departmentIds) {
         this.departmentIds = departmentIds;
     }
+
+    public List<Long> getExcludeIds() {
+        return excludeIds;
+    }
+
+    public void setExcludeIds(List<Long> excludeIds) {
+        this.excludeIds = excludeIds;
+    }
 }

--
Gitblit v1.8.0