From e3e0ec152abd66ca0a9b6ee28940fa98e3cd3a5a Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Fri, 29 Apr 2022 12:14:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=A0=95=EB=B3=B4=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20>=20=EC=A7=88=EB=B3=91=EA=B8=B0=EB=A1=9D=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 27 +++++++++++--------
 .../M_Bf_family_babyBOImpl.java               | 24 ++++++++++++++---
 .../m/bf_family_baby/view_bf_family_baby.ftl  |  2 --
 .../views/ftl/m/login/native_login.ftl        |  4 ++-
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5954792..ed454c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,14 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="계정연동 취소하기 기능적용-1">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="계정연동 취소하기 기능적용-2">
       <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_envBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.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/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" 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/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/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -240,7 +237,8 @@
       <workItem from="1650880342548" duration="16000" />
       <workItem from="1650881164110" duration="14717000" />
       <workItem from="1651074703299" duration="129000" />
-      <workItem from="1651149304746" duration="14968000" />
+      <workItem from="1651149304746" duration="15131000" />
+      <workItem from="1651193694137" duration="7875000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -571,7 +569,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651161846084</updated>
     </task>
-    <option name="localTasksCounter" value="48" />
+    <task id="LOCAL-00048" summary="계정연동 취소하기 기능적용-2">
+      <created>1651167758932</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1651167758932</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -591,7 +596,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
     <MESSAGE value="회원가입 오류 수정" />
     <MESSAGE value="아이디/비밀번호 찾기 적용" />
     <MESSAGE value="계정관리 퍼블리싱 적용-1" />
@@ -616,6 +620,7 @@
     <MESSAGE value="아이디 저장기능 적용" />
     <MESSAGE value="체크리스트 오류 수정" />
     <MESSAGE value="계정연동 취소하기 기능적용-1" />
-    <option name="LAST_COMMIT_MESSAGE" value="계정연동 취소하기 기능적용-1" />
+    <MESSAGE value="계정연동 취소하기 기능적용-2" />
+    <option name="LAST_COMMIT_MESSAGE" value="계정연동 취소하기 기능적용-2" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java
index 490f72e..37c011e 100644
--- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java
+++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java
@@ -116,7 +116,7 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa
 			
 			if(paramMap.get("list_disease_cd_no") != null) {
 				ArrayList<String> list_cd_no = (ArrayList<String>) paramMap.get("list_disease_cd_no");
-				ArrayList<String> list_disease_text = (ArrayList<String>) paramMap.get("list_disease_text");
+//				ArrayList<String> list_disease_text = (ArrayList<String>) paramMap.get("list_disease_text");
 
 				ArrayList<HashMap<String, Object>> disease_list = new ArrayList<>();
 				for (int i = 0; i < list_cd_no.size(); i++) {
@@ -125,7 +125,13 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa
 					HashMap<String, Object> disease = new HashMap<String, Object>();
 					disease.put("cd_no", cd_no);
 					disease.put("smc_no", smc_no);
-					disease.put("disease_text", list_disease_text.get(i));
+
+					//기타 질병의 경우 질병명 입력
+					if(cd_no.equals("BF_B_D_8")) {
+						disease.put("disease_text", paramMap.get("disease_text"));
+					} else {
+						disease.put("disease_text", "");
+					}
 					disease_list.add(disease);
 				}
 				paramMap.put("disease_list", disease_list);
@@ -181,9 +187,12 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa
 			
 			if(paramMap.get("list_disease_cd_no") != null) {
 				ArrayList<String> list_cd_no = (ArrayList<String>) paramMap.get("list_disease_cd_no");
-				ArrayList<String> list_disease_text = (ArrayList<String>) paramMap.get("list_disease_text");
+//				ArrayList<String> list_disease_text = (ArrayList<String>) paramMap.get("list_disease_text");
 //				ArrayList<String> list_disease_text = (ArrayList<String>) paramMap.get("list_disease_text");
 
+				log.info("list_disease_text---------");
+//				log.info(list_disease_text);
+
 				ArrayList<HashMap<String, Object>> disease_list = new ArrayList<>();
 				for (int i = 0; i < list_cd_no.size(); i++) {
 					String cd_no = list_cd_no.get(i);
@@ -191,7 +200,14 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa
 					HashMap<String, Object> disease = new HashMap<String, Object>();
 					disease.put("cd_no", cd_no);
 					disease.put("smc_no", paramMap.get("smc_no"));
-					disease.put("disease_text", list_disease_text.get(i));
+
+					//기타 질병의 경우 질병명 입력
+					if(cd_no.equals("BF_B_D_8")) {
+						disease.put("disease_text", paramMap.get("disease_text"));	
+					} else {
+						disease.put("disease_text", "");
+					}
+					
 					disease_list.add(disease);
 				}
 				log.info("질병목록 -----");
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
index d4657b1..baa04d5 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
@@ -126,8 +126,6 @@
 							<label for="disease_fever" class="p_label">${item['title']}
 								<#if item['cd_no'] == 'BF_B_D_8'>
 									<label for="disease_fever" class="p_label">(<input type="text" name="disease_text" value="${item['disease_text']!}">)</label>
-								<#else>
-									<input type="hidden" name="disease_text" value="">
 								</#if>
 							</label>
 							<div class="fe_input_box">
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl
index 823a585..b9fe84e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl
@@ -6,7 +6,9 @@
             if(getCookie("auto")) {
                 window.ReactNativeWebView.postMessage(JSON.stringify({action:'login', member_id: '${Session.member_id}'}));
             }
-        } catch(e) {}
+        } catch(e) {
+            console.log(e);
+        }
 
         window.location.href="${URL_ROOT}/m/index.do";
     }