From 69c3f385b8389fda49d4db0fc74f31c010b78f86 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 화, 16 11월 2021 11:25:40 +0900 Subject: [PATCH] - 이슈 유형 리스트 가져오기 오류 수정 - 이슈 유형 입력/수정시 사이드바 메뉴 리스트 수정 --- src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 19 ++++++++++++++++++- 1 files changed, 18 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..010f1e8 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; @@ -15,13 +16,21 @@ private String departmentDescription; private Long departmentCount; + private List<Long> excludeIds = Lists.newArrayList(); + private List<Long> departmentIds = Lists.newArrayList(); private Integer Page; 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() { @@ -79,4 +88,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