From 41bc3f309b46b11538b0756d475e1011306f54e7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 09:41:02 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
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