From 2c273d1072424a9363314fb258265cbf487f0297 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 17:48:46 +0900
Subject: [PATCH] - Excel Import 기능 담당부서도 들어가게 하기(기간 미지정 시에도 가능하도록 수정) - 이슈 통합검색 키워드에 업체,ISP,호스팅 정보도 포함 - 프로젝트에서 설정한 이슈유형만 보여주기
---
src/main/java/kr/wisestone/owl/web/condition/UserCondition.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
index 04f3c24..e084ecd 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
@@ -30,9 +30,12 @@
public static UserCondition make(Map<String, Object> conditions) {
UserCondition condition = ConvertUtil.convertMapToClass(conditions, UserCondition.class);
- condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
- condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
-
+ if (MapUtil.getStrings(conditions, "statuses") != null) {
+ condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
+ }
+ if (MapUtil.getStrings(conditions, "excludeIds") != null) {
+ condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
+ }
return condition;
}
--
Gitblit v1.8.0