Merge branch 'jsshin' into develop

src/main/java/com/style24/front/biz/dao/TsfCustomerDao.java

@@ -64,7 +64,7 @@ public interface TsfCustomerDao {
 	 * @author jsshin
 	 * @since 2021. 02. 24
 	 */
-	Customer getCusomterActiveAndDormant(Customer customer);
+	Customer getCustomerActiveAndDormant(Customer customer);
 
 	/**
 	 * SNS 정보로 고객 테이블 조회

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -83,7 +83,7 @@ public class TsfCustomerService {
 		TsfSession.setAttribute("maskingYn", "Y");
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.encryptData(); // 데이터 암호하
-		return customerDao.getCusomterActiveAndDormant(customer);
+		return customerDao.getCustomerActiveAndDormant(customer);
 	}
 
 	/**

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

@@ -289,8 +289,8 @@
 	</insert>
 
 	<!--활동, 휴면 회원만 조회-->
-	<select id="getCusomterActiveAndDormant" parameterType="Customer" resultType="Customer">
-		/* TsfCustomer.getCusomterActiveAndDormant */
+	<select id="getCustomerActiveAndDormant" parameterType="Customer" resultType="Customer">
+		/* TsfCustomer.getCustomerActiveAndDormant */
 		SELECT C.CUST_NO
 		     , C.CUST_ID
 		     , C.EMAIL

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -41,11 +41,16 @@
 	});
 
 	var pushListInfo = function (pushList) {
+		let orgPushList;
+		//IOS는 앱에서 BASE64로 인코딩 한후 전달 한다.
 		if (_osType === 'I') {
-			alert(pushList);
+  			orgPushList = window.atob(pushList);
+		} else if (_osType === 'A') {
+			orgPushList = pushList;
 		}
-		if (!gagajf.isNull(pushList)) {
-			let pushListJosn = JSON.parse(pushList);
+
+		if (!gagajf.isNull(orgPushList)) {
+			let pushListJosn = JSON.parse(orgPushList);
 			let html = '';
 			$.each(pushListJosn.pushList, function(idx, item) {
 				html += '<div class="inner">\n';