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/SysFieldController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
index 5796d73..b89ebd3 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
@@ -51,24 +51,49 @@
SysFieldMapper fieldMapper;
@Autowired
IFlowsService flowsService;
+ @Autowired
+ IMasterAuthorService masterAuthorService;
@RequestMapping(value = "/{tableName}", method = RequestMethod.GET)
public Result getFields(@PathVariable String tableName, HttpServletRequest request){
+ TUser user = DbUtils.getUser(request);
String maintainId = request.getParameter("maintainId");
if (StringUtils.isEmpty(maintainId)) {
List<SysField> fieldList = fieldService.getFieldByTable(tableName);
return Result.success(fieldList);
}else {
+ List<SysField> field = masterAuthorService.getField(user.getUserId(), maintainId);
+ //List<SysField> fieldList = fieldService.getFieldByMaintain(maintainId);
- List<SysField> fieldList = fieldService.getFieldByMaintain(maintainId);
- return Result.success(fieldList);
+ return Result.success(field);
}
}
@RequestMapping(value = "total/{tableName}/{pageNo}", method = RequestMethod.GET)
public Result getTotalFields(@PathVariable String tableName,@PathVariable Integer pageNo, HttpServletRequest request){
+ String totalStr = request.getParameter("isTotal");
String pageSize = request.getParameter("pageSize");
+
+ if (StringUtils.isEmpty(totalStr) || !Boolean.valueOf(totalStr)) {
+ // 璧版潈闄�
+ String maintainId = request.getParameter("maintainId");
+ if (StringUtils.isEmpty(maintainId)){
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ TUser user = DbUtils.getUser(request);
+ List<SysField> field = masterAuthorService.getField(user.getUserId(), maintainId);
+ Integer size;
+ if(StringUtils.isEmpty(pageSize)){
+ size = 15;
+ }else {
+ size = Integer.valueOf(pageSize);
+ }
+
+ return fieldService.getPagedDataByList(field, pageNo, size);
+
+ }
+
if(StringUtils.isEmpty(pageSize)){
return fieldService.getTotalFields(tableName, pageNo, 15);
}else {
--
Gitblit v1.8.0