From 74472c9d22dddcb41383794caf0011043b20f817 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 13:25:47 +0800
Subject: [PATCH] fix 数据权限
---
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index e3e24df..f941fd2 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)
@@ -60,14 +69,19 @@
TUser user = (TUser) session.getAttribute("user");
String userId = user.getUserId();
List<Flows> flows = flowsService.selectList(new EntityWrapper<Flows>().ne("business_type", ActivitiBusinessType.exists).ne("status", ActivitiStatus.open).ne("status", ActivitiStatus.close));
-// flows = flows.stream().filter(flow -> flowsService.isNextAudit(flow, userId)).collect(Collectors.toList());
+ flows = flows.stream().filter(flow -> flowsService.isNextAudit(flow, userId)).collect(Collectors.toList());
HashSet<String> tableNameSet = new HashSet<>();
List<String> maintainIds = flows.stream().map(Flows::getBusinessId).collect(Collectors.toList());
if (maintainIds.size() == 0) {
return Result.success(null);
}
+ maintainIds = maintainIds.stream().filter(s -> masterAuthorService.checkMaintainAuthor(userId,s)).collect(Collectors.toList());
+ if (maintainIds.isEmpty()) {
+ return Result.success(null);
+ }
List<Maintain> maintains = maintainService.selectBatchIds(maintainIds);
+
List<String> tableNameList = maintains.stream().map(Maintain::getTableName).collect(Collectors.toList());
tableNameSet.addAll(tableNameList);
//
@@ -174,7 +188,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 +241,7 @@
// }
// }
- return Result.success(CodeMsg.SUCCESS);
+ return Result.success(menu);
}
@RequestMapping(value = "/update", method = RequestMethod.GET)
@@ -324,6 +338,5 @@
List<SysMenu> sysMenus = menuService.selectList(menuEntityWrapper);
return Result.success(sysMenus);
}
-
}
--
Gitblit v1.8.0