From 9e5aae7f608724c98e7f31e3977a7a64533e9908 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sat, 23 Apr 2022 19:31:58 +0900
Subject: [PATCH] =?UTF-8?q?-=20=EA=B8=B0=EB=B3=B8=EC=9D=8C=EC=95=85?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C=EB=B6=88=EA=B0=80?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 29 +++++++++----------
 .../sqlmap/m/login/com.backoffice.m.login.xml |  2 ++
 .../com.backoffice.m.member_env.xml           |  1 +
 .../views/ftl/m/member_env/view_set_music.ftl | 12 +++++---
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8ecdc6e..9f2e7d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,19 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="- 체크리스트 오류사항 수정">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/admin/bf/bf_notice/A_Bf_noticeBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_notice.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_notice.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_notice/com.backoffice.m.bf_notice.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_notice/com.backoffice.m.bf_notice.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,7 +230,7 @@
       <workItem from="1650613105021" duration="532000" />
       <workItem from="1650638814398" duration="7670000" />
       <workItem from="1650687202332" duration="1688000" />
-      <workItem from="1650693305284" duration="6651000" />
+      <workItem from="1650693305284" duration="10033000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -520,7 +512,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650646900010</updated>
     </task>
-    <option name="localTasksCounter" value="41" />
+    <task id="LOCAL-00041" summary="- 체크리스트 오류사항 수정">
+      <created>1650706673085</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1650706673085</updated>
+    </task>
+    <option name="localTasksCounter" value="42" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -540,7 +539,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)" />
     <MESSAGE value="데이터 연동작업" />
     <MESSAGE value="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면" />
     <MESSAGE value="index_bottom 공유관련 html 스크립트 분리" />
@@ -565,6 +563,7 @@
     <MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
     <MESSAGE value="d-day 체크리스트 사항 수정" />
     <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
+    <MESSAGE value="- 체크리스트 오류사항 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="- 체크리스트 오류사항 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml b/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
index 81eed36..4a73df3 100644
--- a/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
+++ b/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
@@ -232,12 +232,14 @@
 			member_id,
 			music_file_path,
 			music_name,
+		 	base_yn,
 		 	reg_dt
 		)
 		SELECT
 			#member_id#,
 			music_file_path,
 			music_name,
+		    'Y',
 			now()
 		FROM
 			tbl_music_basic;
diff --git a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
index 48560fd..93e06a5 100644
--- a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
+++ b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
@@ -57,6 +57,7 @@
 			a.music_file_path,
 			a.music_name,
 			a.mute_yn,
+			a.base_yn,
 			a.reg_dt
 		FROM tbl_music a
 		WHERE a.member_id = #member_id#
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
index 77e5e17..b407bf5 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
@@ -22,7 +22,7 @@
 							<input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}">
 							<div>${item['music_name']!}</div>
 							<div class="order_button">
-								<button key="${item['idx']!}" onclick="fncRemove(this)" type="button">
+								<button key="${item['idx']!}" base="${item['base_yn']}" onclick="fncRemove(this)" type="button">
 									<img style="width:18px;height:18px" src="../img/setting/delete_ico.png"/>
 								</button>&nbsp;
 								<#if item['mute_yn'] == 'N'>
@@ -143,10 +143,14 @@
 	}
 
 	function fncRemove(e) {
-		delList += $(e).attr("key") + ",";
-		$(e).parent().parent().remove();
+		if($(e).attr("base") == "N") {
+			delList += $(e).attr("key") + ",";
+			$(e).parent().parent().remove();
 
-		$("#delList").val(delList);
+			$("#delList").val(delList);
+		} else {
+			Swal.fire({text: '기본 음악파일은 삭제가 불가능 합니다.'});
+		}
 	}