diff --git a/frontend/src/modules/channelMgt/components/TmpltRejectViewPop.vue b/frontend/src/modules/channelMgt/components/TmpltRejectViewPop.vue index 3cafb09..3d0147d 100644 --- a/frontend/src/modules/channelMgt/components/TmpltRejectViewPop.vue +++ b/frontend/src/modules/channelMgt/components/TmpltRejectViewPop.vue @@ -16,7 +16,7 @@ - {{ option.lmtYm }} + {{ option.content }} 반려 내용이 없습니다. @@ -56,7 +56,8 @@ export default { const result = response.data; if (result != null && result.retCode == "0000") { console.log(result); - //this.list = result.data.list; + this.list = result.rjtData.list; + console.log(this.list); } var dimmed = document.getElementsByClassName('modal25'); for (var i = 0; i < dimmed.length; i++) { diff --git a/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtService.java b/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtService.java index dc6ef81..e1d5d5e 100644 --- a/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/channelMgt/ChannelMgtService.java @@ -107,11 +107,12 @@ public class ChannelMgtService { * @param tmpltListReqDto * @return */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "null" }) public TmpltListResDto tmpltRejectList(TmpltListReqDto tmpltListReqDto) { RjtTmpltListRes tmpltListRes = new RjtTmpltListRes(); Map apiResultMap = null; List> dataListMap = null; + List> dataTempListMap = null; List> rjtDataListMap = null; JSONObject jsonObject = new JSONObject(); @@ -132,7 +133,12 @@ public class ChannelMgtService { Map dataTempMap = dataListMap.get(0); if(dataTempMap.get("comments") != null && !"".equals(dataTempMap.get("comments"))) { - rjtDataListMap = (List>) dataTempMap.get("comments"); + dataTempListMap = (List>) dataTempMap.get("comments"); + for(Map rejectMap : dataTempListMap) { + if("REJ".equals(rejectMap.get("status"))) { + rjtDataListMap.add(rejectMap); + } + } tmpltListRes.setList(rjtDataListMap); } return new TmpltListResDto(ApiResponseCode.SUCCESS, tmpltListRes);