[ST24PRJ-612][FRONT] pc/mo 잔시 상품명 깨짐

src/main/webapp/WEB-INF/views/common/fragments/footer.html

@@ -104,6 +104,7 @@ String.prototype.replaceXSS = function (){	//XSS 변환
 	
 	str = str.split(/&lt;/g).join("<");
 	str = str.split(/&gt;/g).join(">");
+	str = str.split(/&amp;/g).join("&");
 	
 	return str;
 }

src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionRegiForm.html

@@ -604,14 +604,44 @@
 					gridOptionsFreeGoods2List.columnApi.getColumn("limitQty").colDef.editable = false;
 				//}
 			}
-
+			
+			var data = freegift.applyGoodsList;
+			let applyGoodsList = [];
+			$.each(data, function(idx, item) {
+				let goodsNm = item.goodsNm;
+				item.goodsNm = goodsNm.replaceXSS();
+				applyGoodsList.push(item);
+			});
+			
+			var data = freegift.exceptGoodsList
+			let exceptGoodsList = [];
+			$.each(data, function(idx, item) {
+				let goodsNm = item.goodsNm;
+				item.goodsNm = goodsNm.replaceXSS();
+				exceptGoodsList.push(item);
+			});
+			
+			var data = freegift.freeGoods1
+			let freeGoods1 = [];
+			$.each(data, function(idx, item) {
+				let goodsNm = item.goodsNm;
+				item.goodsNm = goodsNm.replaceXSS();
+				freeGoods1.push(item);
+			});
+			var data = freegift.freeGoods2
+			let freeGoods2 = [];
+			$.each(data, function(idx, item) {
+				let goodsNm = item.goodsNm;
+				item.goodsNm = goodsNm.replaceXSS();
+				freeGoods2.push(item);
+			});
 			gridOptionsFGExtmallList.api.setRowData(freegift.extmallList);
 			gridOptionsFGCompanyList.api.setRowData(freegift.supplyCompList);
 			gridOptionsFGBrandList.api.setRowData(freegift.brandList);
-			gridOptionsFGApplyGoodsList.api.setRowData(freegift.applyGoodsList);
-			gridOptionsFGExceptGoodsList.api.setRowData(freegift.exceptGoodsList);
-			gridOptionsFreeGoods1List.api.setRowData(freegift.freeGoods1);
-			gridOptionsFreeGoods2List.api.setRowData(freegift.freeGoods2);
+			gridOptionsFGApplyGoodsList.api.setRowData(applyGoodsList);
+			gridOptionsFGExceptGoodsList.api.setRowData(exceptGoodsList);
+			gridOptionsFreeGoods1List.api.setRowData(freeGoods1);
+			gridOptionsFreeGoods2List.api.setRowData(freeGoods2);
 		}
 		fnUnEscapeHtml();	//XSS변환
 	}

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -928,6 +928,15 @@
 					xhr.setRequestHeader('Content-Type'	, 'application/json');
 				},
 				success 	: function(result) {
+						var data = result.returnList;
+						let modifyList = [];
+						$.each(data, function(idx, item) {
+							let brandEnm = item.brandEnm;
+							item.brandEnm = brandEnm.replaceXSS();
+							
+							modifyList.push(item);
+						});
+						gridOptionsFGBrandList.api.setRowData(modifyList);
 					if (result != null) {
 						for(let i = 0 ; i < result.returnList.length ; i++) {
 							let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);		// 받아온 모든 데이터

src/main/webapp/WEB-INF/views/system/CommoncodeForm.html

@@ -210,7 +210,7 @@
 		let actionUrl = $('#searchForm').prop('action') + '?' + $('#searchForm').serialize();
 		
 		// Fetch data
-		gagaAgGrid.fetch(actionUrl, gridOptions1);
+		gagaAgGrid.fetch(actionUrl, gridOptions1,null,fnChangeGrid);
 	});
 	
 	// 상세코드 조회
@@ -218,7 +218,7 @@
 	let fnGetDetailCode = function(cd) {
 		gCd = cd;
 		let actionUrl = $('#searchForm').prop('action') + '?cdGb=' + cd;
-		gagaAgGrid.fetch(actionUrl, gridOptions2,null,fnChangeGrid);
+		gagaAgGrid.fetch(actionUrl, gridOptions2,null,fnChangeGrid1);
 	}
 	
 	// 신규
@@ -254,6 +254,19 @@
 	};
 	
 	var fnChangeGrid = function(){	//XSS 그리드 내 변환
+		var data = gagaAgGrid.getAllRowData(gridOptions1);
+		let modifyList = [];
+		$.each(data, function(idx, item) {
+			let cdNm = item.cdNm;
+			
+			item.cdNm = cdNm.replaceXSS();
+			
+			modifyList.push(item);
+		});
+		gridOptions1.api.setRowData(modifyList);
+	};
+	
+	var fnChangeGrid1 = function(){	//XSS 그리드 내 변환
 		var data = gagaAgGrid.getAllRowData(gridOptions2);
 		let modifyList = [];
 		$.each(data, function(idx, item) {