diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java index 67db28d..ddfe910 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java @@ -92,7 +92,6 @@ public class MenuPlanContent { } } } - // 转换成字符串 public String toContentStr() { return JsonUtil.encodeString(list); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java index 7404fd4..9914805 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java @@ -184,13 +184,17 @@ public class MenuPlanHandler { } MenuPlanContent menuPlanContent = new MenuPlanContent(menuPlan.getContent()); MenuPlanItem menuPlanItem = menuPlanContent.findById(id); + MenuPlanItem parent; if (menuPlanItem == null) { return new SwMap(); + }else { + parent = menuPlanContent.findParentById(menuPlanItem.getId()); } SwMap r = new SwMap(); r.putAll(menuPlanItem.getData()); r.put("plan_id", plan_id); r.put("type", menuPlanItem.getMenu() > 0 ? 1 : 0); + r.put("parent_id",parent == null ? -1 : parent.getId()); return r; } return super.loadData(filter, pageDataSet);