From 583fa0d221e76a706becb6406180790972634882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO>
Date: Fri, 4 Nov 2022 14:58:19 +0900
Subject: [PATCH] =?UTF-8?q?JwtTokenUtil=20-=20=EA=B0=80=EC=9E=85=ED=95=9C?=
 =?UTF-8?q?=20=EA=B7=B8=EB=A3=B9=EC=9D=B4=20=ED=95=98=EB=82=98=EB=8F=84=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20nullPointException=20?=
 =?UTF-8?q?=EC=83=9D=EA=B8=B0=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/api/acnt/jwt/utils/JwtTokenUtil.java       | 14 ++++++++------
 .../repository/ctr/CtrCntrlQueryRepository.java    | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
index a1b729f..3a6019d 100644
--- a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
+++ b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
@@ -140,12 +140,14 @@ public class JwtTokenUtil implements Serializable {
         Claims payload = getAllClaimsFromToken(token);
         List<LinkedHashMap> groupList = payload.get("group", ArrayList.class);
         List<JwtGroupModel> r = new ArrayList<>();
-
-        for(LinkedHashMap<String, String> map : groupList){
-            JwtGroupModel model = new JwtGroupModel();
-            model.setGroupId(map.get("groupId"));
-            model.setGroupAuthCd(map.get("groupAuthCd"));
-            r.add(model);
+        
+        if(groupList!=null) {
+	        for(LinkedHashMap<String, String> map : groupList){
+	            JwtGroupModel model = new JwtGroupModel();
+	            model.setGroupId(map.get("groupId"));
+	            model.setGroupAuthCd(map.get("groupAuthCd"));
+	            r.add(model);
+	        }
         }
         return r;
     }
diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
index fb77908..2db52f7 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
@@ -1510,12 +1510,14 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		  
 		  
 		  for(CtrCntrlGroupModel list : model) {
-			  for(JwtGroupModel lists : groupAuth) {
-				  if(list.getGroupId().equals(lists.getGroupId())) {
-					  list.setGroupAuthCd(lists.getGroupAuthCd());
-					  break;
-				  }else {
-					  list.setGroupAuthCd("");
+			  if(groupAuth != null) {
+				  for(JwtGroupModel lists : groupAuth) {
+					  if(list.getGroupId().equals(lists.getGroupId())) {
+						  list.setGroupAuthCd(lists.getGroupAuthCd());
+						  break;
+					  }else {
+						  list.setGroupAuthCd("");
+					  }
 				  }
 			  }
 		  }