Browse Source

JwtTokenUtil - 가입한 그룹이 하나도 없을 경우 nullPointException 생기던 오류 수정

Test
박재우 2 years ago
parent
commit
583fa0d221
  1. 12
      src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java
  2. 14
      src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

12
src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java

@ -141,11 +141,13 @@ public class JwtTokenUtil implements Serializable {
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;
}

14
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("");
}
}
}
}

Loading…
Cancel
Save