From 3600e939238a3acdd78c82b8c9c573d439bd1294 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 11 11월 2021 18:40:19 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트 및 백 수정

---
 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