From 43e5b455ca08dd2a8930358389d758ba8867899f Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 10 Jul 2024 13:42:39 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=97=85=EC=B2=B4=EA=B2=80=EC=83=89=20>?=
 =?UTF-8?q?=20=EB=8C=80=ED=91=9C=EC=9E=90=20=EA=B2=80=EC=83=89=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8C=80=ED=91=9C=EC=9E=90=20null=20=EC=9D=B8=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EC=97=90=EB=9F=AC=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nims/service/bean/BizNimsServiceBean.java | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
index 681ebae..31cd40a 100644
--- a/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
+++ b/src/main/java/cokr/xit/adds/biz/nims/service/bean/BizNimsServiceBean.java
@@ -111,7 +111,7 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
 				d.setRgtr(reqDto.getUserId());
 				bizNimsMapper.mergeBsshInfoSt(d);
 				// 대표자 검색조건이 있는 경우
-				if (isRprsntvNm && d.getRprsntvNm().contains(reqDto.getRprsntvNm())) {
+				if (isRprsntvNm && !isEmpty(d.getRprsntvNm()) && d.getRprsntvNm().contains(reqDto.getRprsntvNm())) {
 					list.add(d);
 				}
 			}
@@ -217,17 +217,18 @@ public class BizNimsServiceBean extends AbstractServiceBean implements BizNimsSe
 			}
 		}else {
 			list.addAll(curList);
-			list.sort((a, b) -> {
-				if (isEmpty(a.getPrdValidDe()) && isEmpty(b.getPrdValidDe()))
-					return 0;
-				if (isEmpty(a.getPrdValidDe()))
-					return -1;
-				if (isEmpty(b.getPrdValidDe()))
-					return 1;
-				return a.getPrdValidDe().compareTo(b.getPrdValidDe());
-			});
 		}
 
+		list.sort((a, b) -> {
+			if (isEmpty(a.getPrdValidDe()) && isEmpty(b.getPrdValidDe()))
+				return 0;
+			if (isEmpty(a.getPrdValidDe()))
+				return -1;
+			if (isEmpty(b.getPrdValidDe()))
+				return 1;
+			return a.getPrdValidDe().compareTo(b.getPrdValidDe());
+		});
+
 		ApiBaseResponse<List<NimsApiDto.MnfSeqInfo>> res = ApiBaseResponse.of(list);
 		res.setTotalCount(rslt.getBody().getTotalCount());
 		return res;