|
@@ -184,13 +184,17 @@ public class MenuPlanHandler { |
|
|
} |
|
|
} |
|
|
MenuPlanContent menuPlanContent = new MenuPlanContent(menuPlan.getContent()); |
|
|
MenuPlanContent menuPlanContent = new MenuPlanContent(menuPlan.getContent()); |
|
|
MenuPlanItem menuPlanItem = menuPlanContent.findById(id); |
|
|
MenuPlanItem menuPlanItem = menuPlanContent.findById(id); |
|
|
|
|
|
MenuPlanItem parent; |
|
|
if (menuPlanItem == null) { |
|
|
if (menuPlanItem == null) { |
|
|
return new SwMap(); |
|
|
return new SwMap(); |
|
|
|
|
|
}else { |
|
|
|
|
|
parent = menuPlanContent.findParentById(menuPlanItem.getId()); |
|
|
} |
|
|
} |
|
|
SwMap r = new SwMap(); |
|
|
SwMap r = new SwMap(); |
|
|
r.putAll(menuPlanItem.getData()); |
|
|
r.putAll(menuPlanItem.getData()); |
|
|
r.put("plan_id", plan_id); |
|
|
r.put("plan_id", plan_id); |
|
|
r.put("type", menuPlanItem.getMenu() > 0 ? 1 : 0); |
|
|
r.put("type", menuPlanItem.getMenu() > 0 ? 1 : 0); |
|
|
|
|
|
r.put("parent_id",parent == null ? -1 : parent.getId()); |
|
|
return r; |
|
|
return r; |
|
|
} |
|
|
} |
|
|
return super.loadData(filter, pageDataSet); |
|
|
return super.loadData(filter, pageDataSet); |
|
|