디폴트 선택한 아이 유지안되는 버그 수정

dev_bert
jonghwan76 3 years ago
parent ceb3d71cd8
commit 2b102cc8fc

@ -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>

@ -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);

Loading…
Cancel
Save