From a7a6aa6574cc682baa09e124cae0cfc0e1e9366f Mon Sep 17 00:00:00 2001
From: kubo8 <kubo8@DESKTOP-OPVR0UR>
Date: Mon, 13 Feb 2023 10:00:45 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=98=EB=A0=A4=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channelMgt/components/TmpltRejectViewPop.vue       |  5 +++--
 .../co/uplus/ez/api/channelMgt/ChannelMgtService.java  | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

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 @@
         </thead>
         <tbody>
         <tr v-for="(option, i) in list" v-bind:key="i">
-          <td>{{ option.lmtYm }}</td>
+          <td>{{ option.content }}</td>
         </tr>
         <tr v-if="list.length === 0">
           <td>반려 내용이 없습니다.</td>
@@ -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<Object, Object> apiResultMap = null;
 		List<Map<Object,Object>> dataListMap = null;
+		List<Map<Object,Object>> dataTempListMap = null;
 		List<Map<Object,Object>> rjtDataListMap = null;
 		
 		JSONObject jsonObject = new JSONObject();
@@ -132,7 +133,12 @@ public class ChannelMgtService {
 				Map<Object, Object> dataTempMap = dataListMap.get(0);
 				
 				if(dataTempMap.get("comments") != null && !"".equals(dataTempMap.get("comments"))) {
-					rjtDataListMap = (List<Map<Object, Object>>) dataTempMap.get("comments");
+					dataTempListMap = (List<Map<Object, Object>>) dataTempMap.get("comments");
+					for(Map<Object, Object> rejectMap : dataTempListMap) {
+						if("REJ".equals(rejectMap.get("status"))) {
+							rjtDataListMap.add(rejectMap);
+						}
+					}
 					tmpltListRes.setList(rjtDataListMap);
 				}
 				return new TmpltListResDto(ApiResponseCode.SUCCESS, tmpltListRes);