From ccb933362251344091a3881a4950dcab33c5008f Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 28 三月 2020 11:47:55 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index f926bd4..99b343f 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -46,12 +46,21 @@
IMaintainService maintainService;
@Autowired
IMaintainFieldService maintainFieldService;
-
+ @Autowired
+ IMasterAuthorService masterAuthorService;
+
@RequestMapping(value = "/all", method = RequestMethod.GET)
public Result<List<SysMenu>> getAll() {
EntityWrapper<SysMenu> sysMenuEntityWrapper = new EntityWrapper<>();
sysMenuEntityWrapper.orderBy("parent_id, order_no");
return Result.success(menuService.selectList(sysMenuEntityWrapper)) ;
+ }
+
+ @RequestMapping(value = "/author/all", method = RequestMethod.GET)
+ public Result<List<SysMenu>> getAllBak(HttpServletRequest request) {
+ TUser user = DbUtils.getUser(request);
+ List<SysMenu> menu = masterAuthorService.getMenu(user.getUserId());
+ return Result.success(menu) ;
}
@RequestMapping(value = "/audit", method = RequestMethod.GET)
@@ -174,7 +183,7 @@
menu.setMenuType(menuType);
boolean inserted = menuService.insert(menu);
if (inserted) {
- return Result.success("鎻掑叆鎴愬姛", null);
+ return Result.success(menu);
} else {
return Result.error(CodeMsg.INSERT_ERROR);
}
@@ -227,7 +236,7 @@
// }
// }
- return Result.success(CodeMsg.SUCCESS);
+ return Result.success(menu);
}
@RequestMapping(value = "/update", method = RequestMethod.GET)
@@ -324,6 +333,5 @@
List<SysMenu> sysMenus = menuService.selectList(menuEntityWrapper);
return Result.success(sysMenus);
}
-
}
--
Gitblit v1.8.0