|
@@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.tld.mapper.MenuMapper;
|
|
import com.tld.mapper.MenuMapper;
|
|
import com.tld.model.Menu;
|
|
import com.tld.model.Menu;
|
|
-import com.tld.model.Role;
|
|
|
|
import com.tld.service.MenuService;
|
|
import com.tld.service.MenuService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -27,7 +26,7 @@ public class MenuServiceImpl implements MenuService {
|
|
menu1.setPId(menu1.getId());
|
|
menu1.setPId(menu1.getId());
|
|
treeMap.put("children", getChildren(menu1));
|
|
treeMap.put("children", getChildren(menu1));
|
|
treeMap.put("title", menu1.getName());
|
|
treeMap.put("title", menu1.getName());
|
|
- treeMap.put("id", menu1.getId());
|
|
|
|
|
|
+ treeMap.put("key", menu1.getId());
|
|
treeMap.put("url", menu1.getUrl());
|
|
treeMap.put("url", menu1.getUrl());
|
|
list.add(treeMap);
|
|
list.add(treeMap);
|
|
}
|
|
}
|
|
@@ -46,7 +45,6 @@ public class MenuServiceImpl implements MenuService {
|
|
public Map<String, Object> addMenu(Menu menu) {
|
|
public Map<String, Object> addMenu(Menu menu) {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
try{
|
|
try{
|
|
- System.out.println(menu.getPId());
|
|
|
|
menuMapper.addMenu(menu);
|
|
menuMapper.addMenu(menu);
|
|
map.put("msg", "200");
|
|
map.put("msg", "200");
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -107,7 +105,7 @@ public class MenuServiceImpl implements MenuService {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
try{
|
|
try{
|
|
PageHelper.startPage(menu.getPage(), menu.getLimit());
|
|
PageHelper.startPage(menu.getPage(), menu.getLimit());
|
|
- PageInfo<Menu> list = new PageInfo<>(menuMapper.getMenu(menu));
|
|
|
|
|
|
+ PageInfo<Menu> list = new PageInfo<>(menuMapper.getPage(menu));
|
|
map.put("data", list);
|
|
map.put("data", list);
|
|
map.put("msg", "200");
|
|
map.put("msg", "200");
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -128,7 +126,7 @@ public class MenuServiceImpl implements MenuService {
|
|
Map<String, Object> treeMap = new TreeMap<>();
|
|
Map<String, Object> treeMap = new TreeMap<>();
|
|
menu1.setPId(menu1.getId());
|
|
menu1.setPId(menu1.getId());
|
|
treeMap.put("title", menu1.getName());
|
|
treeMap.put("title", menu1.getName());
|
|
- treeMap.put("id", menu1.getId());
|
|
|
|
|
|
+ treeMap.put("key", menu1.getId());
|
|
treeMap.put("children", getChildren(menu1));
|
|
treeMap.put("children", getChildren(menu1));
|
|
treeMap.put("url", menu1.getUrl());
|
|
treeMap.put("url", menu1.getUrl());
|
|
listTree.add(treeMap);
|
|
listTree.add(treeMap);
|