From 006cc190724fafbcdb5c768d1365e6c6e186450b Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Thu, 5 May 2022 16:41:05 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EA=B3=84=EC=A0=95=EC=97=B0=EB=8F=99?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20>=20=EB=B3=B8=EC=9D=B8=EA=B3=84=EC=A0=95?=
 =?UTF-8?q?=20=EC=97=B0=EB=8F=99=ED=95=B4=EC=A0=9C=20=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EB=A7=89=EA=B8=B0=20-=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=202.=20=EC=9D=8C=EC=95=85=EC=84=A4=EC=A0=95=20>=20=ED=94=8C?=
 =?UTF-8?q?=EB=9F=AC=EC=8A=A4=20=EB=B2=84=ED=8A=BC=EC=8B=9C=20=EC=9D=8C?=
 =?UTF-8?q?=EC=95=85=ED=8C=8C=EC=9D=BC=20=EC=B2=A8=EB=B6=80=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=EB=90=98=EB=8F=84=EB=A1=9D.=20-=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 +++++++++----------
 .../m/member_env/M_Member_envController.java  |  2 +-
 .../views/ftl/m/member_env/view_set_music.ftl |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 68dfdc0..67d21f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록.">
       <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/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/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" 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" />
@@ -251,13 +250,7 @@
       <workItem from="1651626281483" duration="151000" />
       <workItem from="1651631474537" duration="12924000" />
       <workItem from="1651659992753" duration="18000" />
-    </task>
-    <task id="LOCAL-00010" summary="예방접종 표시 오류 수정">
-      <created>1648559536812</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1648559536812</updated>
+      <workItem from="1651735183816" duration="1069000" />
     </task>
     <task id="LOCAL-00011" summary="음악설정 수정&#10;부모정보 변경 삭제">
       <created>1648822833746</created>
@@ -595,7 +588,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651642988293</updated>
     </task>
-    <option name="localTasksCounter" value="59" />
+    <task id="LOCAL-00059" summary="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록.">
+      <created>1651675831475</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1651675831475</updated>
+    </task>
+    <option name="localTasksCounter" value="60" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -615,7 +615,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="메모리 공유기능 적용 - 카카오, URL복사" />
     <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
     <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
     <MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
@@ -640,7 +639,8 @@
     <MESSAGE value="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정" />
     <MESSAGE value="앱 네이버소셜로그인 수정" />
     <MESSAGE value="카카오 소셜로그인 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="카카오 소셜로그인 수정" />
+    <MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
+    <option name="LAST_COMMIT_MESSAGE" value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
index 7761798..2353466 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
@@ -205,7 +205,7 @@ public class M_Member_envController extends AbstractControllerManager{
 					DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
 					paramMap.copyFromDataMapByKeys(rm_mem, new String[]{"member_id"});
 
-					if(paramMap.get("del_member_id").equals(paramMap.get("del_member_id"))) {
+					if(paramMap.get("member_id").equals(paramMap.get("del_member_id"))) {
 						result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
 					} else {
 						member_envBO.delete_member_sync(paramMap);
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 5617ccb..4df70a0 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
@@ -110,11 +110,11 @@
 		//음소거여부 yn목록
 		$("input[name='file']").each(function(index, item){
 			if( $(item).val() == "") {
-				bAddFile = true;
+				bAddNoFile = true;
 			}
 		});
 
-		if(bAddFile) {
+		if(bAddNoFile) {
 			Swal.fire({text: '추가한 음악은 파일을 지정해야 합니다.'});
 			return;
 		}