Commit a2163795 by naan1993

菜单更新

parent 2ba4f510
...@@ -86,15 +86,15 @@ public class MenuController extends BaseController { ...@@ -86,15 +86,15 @@ public class MenuController extends BaseController {
Menu pMenu = this.menuMapper.selectOne(temp); Menu pMenu = this.menuMapper.selectOne(temp);
//如果父级是顶级菜单 //如果父级是顶级菜单
if(pMenu == null){ if (pMenu == null) {
menu.setPcode("0"); menu.setPcode("0");
}else{ } else {
//设置父级菜单的code为父级菜单的id //设置父级菜单的code为父级菜单的id
menu.setPcode(String.valueOf(pMenu.getId())); menu.setPcode(String.valueOf(pMenu.getId()));
} }
Map<String, Object> menuMap = BeanKit.beanToMap(menu); Map<String, Object> menuMap = BeanKit.beanToMap(menu);
menuMap.put("pcodeName",ConstantFactory.me().getMenuNameByCode(temp.getCode())); menuMap.put("pcodeName", ConstantFactory.me().getMenuNameByCode(temp.getCode()));
model.addAttribute("menu", menuMap); model.addAttribute("menu", menuMap);
LogObjectHolder.me().set(menu); LogObjectHolder.me().set(menu);
return PREFIX + "menu_edit.html"; return PREFIX + "menu_edit.html";
...@@ -221,15 +221,16 @@ public class MenuController extends BaseController { ...@@ -221,15 +221,16 @@ public class MenuController extends BaseController {
* 根据请求的父级菜单编号设置pcode和层级 * 根据请求的父级菜单编号设置pcode和层级
*/ */
private void menuSetPcode(@Valid Menu menu) { private void menuSetPcode(@Valid Menu menu) {
if(ToolUtil.isEmpty(menu.getPcode()) || menu.getPcode().equals("0")){ if (ToolUtil.isEmpty(menu.getPcode()) || menu.getPcode().equals("0")) {
menu.setPcode("0"); menu.setPcode("0");
menu.setLevels(1); menu.setLevels(1);
}else{ } else {
int code = Integer.parseInt(menu.getPcode()); int code = Integer.parseInt(menu.getPcode());
Menu pMenu = menuMapper.selectById(code); Menu pMenu = menuMapper.selectById(code);
Integer pLevels = pMenu.getLevels(); Integer pLevels = pMenu.getLevels();
menu.setPcode(pMenu.getCode()); menu.setPcode(pMenu.getCode());
menu.setLevels(pLevels + 1); menu.setLevels(pLevels + 1);
menu.setPcodes(pMenu.getPcodes() + "[" + pMenu.getCode() + "],");
} }
} }
......
...@@ -43,8 +43,12 @@ public class MenuTest extends BaseJunit { ...@@ -43,8 +43,12 @@ public class MenuTest extends BaseJunit {
pcodes.push(parentMenu.getCode()); pcodes.push(parentMenu.getCode());
parentMenu = getParentMenu(parentMenu.getPcode()); parentMenu = getParentMenu(parentMenu.getPcode());
} }
for(int i = 0 ;i<pcodes.size();i++){ int pcodeSize = pcodes.size();
for (int i = 0; i < pcodeSize; i++) {
String code = pcodes.pop(); String code = pcodes.pop();
if (code.equals(menu.getCode())) {
continue;
}
sb.append("[" + code + "],"); sb.append("[" + code + "],");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment