From c23fb74967932d628e1379a8a78a7ab5aa5c9c97 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 17:03:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
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