Selaa lähdekoodia

메인전시 수정

bin2107 5 vuotta sitten
vanhempi
commit
7e2724451c

+ 1 - 0
src/main/java/com/style24/persistence/domain/MainDisplay.java

@@ -20,4 +20,5 @@ public class MainDisplay extends TscBaseDomain {
     private String orgFileNm;
     private String sysFileNm;
     private String newSysFileNm;
+    private String contentsTitle;
 }

+ 12 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsaDsiplay.xml

@@ -787,7 +787,7 @@
 					,REG_DT
 				)
 				VALUES (
-					#{brandGroupNo}
+		            IFNULL(NULLIF(#{brandGroupNo},''),0)
 				    ,#{cateCd}
 				    ,#{goodsCd}
 				    ,(SELECT	IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
@@ -1260,6 +1260,7 @@
 			,CONTENTS_YN
 			,COL_CNT
 			,COL_NO
+			,CONTENTS_TITLE
 			,ORG_FILE_NM
 			,SYS_FILE_NM
 			,REG_NO
@@ -1271,11 +1272,18 @@
 		(
 		 	#{cateNo}
 		 	,#{contentsLoc}
-		 	,#{brandGroupNo}
+		 	,IFNULL(NULLIF(#{brandGroupNo},''),0)
 		 	,#{dispOrd}
 			,#{contentsYn}
 			,#{colCnt}
 			,#{colNo}
+			,(SELECT CONTENTS_TITLE
+			    FROM TMP_MAIN_LAYOUT_TITLE
+			    WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc}
+		        <if test='brandGroupNo != null and brandGroupNo != ""'>
+			      AND BRAND_GROUP_NO = #{brandGroupNo}
+				</if>
+			)
 			,#{orgFileNm}
 			,#{sysFileNm}
 			,#{regNo}
@@ -1604,7 +1612,7 @@
 		(
 		 	#{cateNo}
 		 	,#{contentsLoc}
-		 	,IFNULL(REPLACE(#{brandGroupNo},'',NULL),0)
+		 	,IFNULL(NULLIF(#{brandGroupNo},''),0)
 			,#{contentsTitle}
 			,#{regNo}
 			,NOW()
@@ -1697,7 +1705,7 @@
 		)
 		VALUES
 		(
-			IFNULL(#{brandGroupNo},0)
+			 IFNULL(NULLIF(#{brandGroupNo},''),0)
 		 	,#{cateNo}
 		 	,(SELECT LEAF_CATE_NO FROM (SELECT	LEAF_CATE_NO
 					   					FROM	TB_CATE_4SRCH

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

@@ -586,7 +586,8 @@
 
 		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
 				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'){
+				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'|| contentsLoc=='SBM008'
+				|| contentsLoc=='SBM007' || contentsLoc=='SBM013'){
 			if(!gagajf.checkRequired("#contentsTitleForm")){
 				return;
 			}
@@ -778,7 +779,8 @@
 
 		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
 				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'){
+				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'|| contentsLoc=='SBM008'
+				|| contentsLoc=='SBM007' || contentsLoc=='SBM013'){
 			var data = {
 				cateNo : cateNo
 				, contentsLoc : contentsLoc
@@ -1009,7 +1011,8 @@
 
 		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
 				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'){
+				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009' || contentsLoc=='SBM008'
+				|| contentsLoc=='SBM007' || contentsLoc=='SBM013'){
 			$("#contentsTitleForm").show();
 		}else{
 			$("#contentsTitleForm").hide();