From 2b102cc8fcc1c45ba6c2186c72cdcea290cbe1ba Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Fri, 29 Apr 2022 14:34:20 +0900
Subject: [PATCH] =?UTF-8?q?=EB=94=94=ED=8F=B4=ED=8A=B8=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=ED=95=9C=20=EC=95=84=EC=9D=B4=20=EC=9C=A0=EC=A7=80?=
 =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 26 +++++++++----------
 .../backoffice/m/index/M_IndexController.java |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 700b781..378331c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이정보수정 &gt; 질병기록 오류 수정">
+    <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/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -236,14 +236,7 @@
       <workItem from="1650881164110" duration="14717000" />
       <workItem from="1651074703299" duration="129000" />
       <workItem from="1651149304746" duration="15131000" />
-      <workItem from="1651193694137" duration="9915000" />
-    </task>
-    <task id="LOCAL-00001" summary="최초 커밋">
-      <created>1645354476031</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1645354476031</updated>
+      <workItem from="1651193694137" duration="11435000" />
     </task>
     <task id="LOCAL-00002" summary="설정파일커밋">
       <created>1646014385815</created>
@@ -581,7 +574,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651202097639</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="추천이유식 레시피 식재료 번호 수정">
+      <created>1651208904947</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1651208904948</updated>
+    </task>
+    <option name="localTasksCounter" value="51" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -601,7 +601,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="계정관리 퍼블리싱 적용-1" />
     <MESSAGE value="회원가입 퍼블리싱 페이지 적용" />
     <MESSAGE value="회원가입 퍼블리싱 페이지 적용-2" />
@@ -626,6 +625,7 @@
     <MESSAGE value="계정연동 취소하기 기능적용-1" />
     <MESSAGE value="계정연동 취소하기 기능적용-2" />
     <MESSAGE value="아이정보수정 &gt; 질병기록 오류 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="아이정보수정 &gt; 질병기록 오류 수정" />
+    <MESSAGE value="추천이유식 레시피 식재료 번호 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="추천이유식 레시피 식재료 번호 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index 66ddb9c..d2d1d2e 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -298,7 +298,7 @@ public class M_IndexController extends AbstractControllerManager{
 			}		
 			
 			// 디폴트 요청한 아이가 없고 현재 세션에 저장된 아이가 없다면 첫번째 아이로 세션 저장
-			if((RenaStringUtil.isNullOrEmpty(smc_no) == true || rm_child == null)&& lm_child.size() > 0) {
+			if((RenaStringUtil.isNullOrEmpty(smc_no) == true && rm_child == null)&& lm_child.size() > 0) {
 				rm_child = lm_child.get(0);
 				DataMap.putToModel(model, "rm_child", rm_child);
 				session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);