Merge remote-tracking branch 'TSIT/ST24PRJ-557' into develop

src/main/java/com/style24/admin/biz/web/TsaShoplinkerController.java

@@ -332,14 +332,18 @@ log.info(" #### SHOPLINKER CHKE 1 - "+runMap.getRunCnt()+" | "+runMap.getSidOver
 		
 		ShoplinkerGoods result = admShoplinkerService.getGoodsSendPreviewInfo(map);
 		String detail = result.getXmlTxt();
-		int startIdx = detail.indexOf("<detail_desc>");
-		int endIdx = detail.indexOf("</detail_desc>");
-		
 		String html = "";
-		if( "Y".equals(result.getTobeFormYn())) {
-			html = detail.substring(startIdx+13, endIdx);
+		if( null != detail) {
+			int startIdx = detail.indexOf("<detail_desc>");
+			int endIdx = detail.indexOf("</detail_desc>");
+			
+			if( "Y".equals(result.getTobeFormYn())) {
+				html = detail.substring(startIdx+13, endIdx);
+			}else {
+				html = "<div style=\"max-width:1200px; margin:auto;\">" + detail.substring(startIdx+13, endIdx) + "</div>";
+			}
 		}else {
-			html = "<div style=\"max-width:1200px; margin:auto;\">" + detail.substring(startIdx+13, endIdx) + "</div>";
+			html = "<p>표시할 내용이 없습니다.</p>";
 		}
 		
 		result.setXmlTxt(html);