Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

src/main/java/com/style24/admin/support/config/TsaWebMvcConfig.java

@@ -16,8 +16,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import com.style24.admin.support.interceptor.TsaDefaultInterceptor;
 import com.style24.admin.support.interceptor.TsaPosInterceptor;
 import com.style24.admin.support.readable.TsaRequestFilter;
+import com.style24.core.support.filter.TscXssServletFilter;
 
-import com.gagaframework.web.core.filter.GagaXssServletFilter;
 import com.gagaframework.web.rest.client.GagaRequestStringTrim;
 
 /**
@@ -84,7 +84,8 @@ public class TsaWebMvcConfig implements WebMvcConfigurer {
 	@Bean
 	public FilterRegistrationBean xssFilterRegistrationBean() {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
-		bean.setFilter(new GagaXssServletFilter());
+//		bean.setFilter(new GagaXssServletFilter());
+		bean.setFilter(new TscXssServletFilter());
 		bean.setOrder(2);
 		bean.addUrlPatterns("/*");
 		return bean;

src/main/java/com/style24/persistence/mybatis/shop/TsaDsiplay.xml

@@ -1944,7 +1944,7 @@
 		     , CG.DISP_ORD AS CONTENTS_DISP_ORD
 		FROM TB_CONTENTS_GOODS CG
 		JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
-		JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
+		LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
 		WHERE 1=1
 		<if test="contentsLoc != 'SMM012'">
 		AND CG.CATE_NO = #{cateNo}

src/main/java/com/style24/persistence/mybatis/shop/TsaFaq.xml

@@ -32,6 +32,7 @@
 		        LOWER(ANSWER) LIKE CONCAT('%',LOWER(#{searchTxt}),'%')
 		       )
 		</if>
+		ORDER BY REG_DT DESC
 	</select>
 
 	<!-- FAQ 등록/수정 -->

src/main/webapp/WEB-INF/views/board/FaqForm.html

@@ -101,8 +101,8 @@
 	// specify the columns
 	let columnDefs = [
 		{
-			headerName: "No", width: 60, cellClass: 'text-center',
-			valueGetter: function(params) { return params.node.rowIndex + 1 }
+			headerName: "FAQ번호", field: "faqSq" ,width: 70, cellClass: 'text-center',
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
 			headerName: "사이트", field: "siteCd", width: 150, cellClass: 'text-center',

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -920,7 +920,7 @@
 			}
 			if(contentsTypeVal=='P'){
 				if(gagajf.isNull($(this).find("input[name=planSq"+thisIdx+"]").val())){
-					mcxDialog.alert('기획전 번호를 입력해주세요.');
+					mcxDialog.alert((i+1)+'번째 기획전 번호를 입력해주세요.');
 					$(this).find("input[name=planSq"+thisIdx+"]").focus();
 					dataBool = false;
 				}