From b5636e416a2fe029f96aec6ddfd3489394925b15 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 24 三月 2020 19:33:53 +0800
Subject: [PATCH] add 数据权限
---
src/main/java/com/highdatas/mdm/controller/MasterDataController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
index 2f2186b..d33f3d5 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
@@ -13,7 +13,6 @@
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
-import org.pentaho.reporting.libraries.formula.function.text.StringCountFunction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +20,9 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -99,7 +100,11 @@
version = String.valueOf(nowVersion.getVersion());
}else if(version.equalsIgnoreCase(Constant.MAX)){
findMax = true;
- version = String.valueOf(maintainService.getMaxVersion(tableName).getVersion());
+ Maintain maxVersion = maintainService.getMaxVersion(tableName);
+ if (maxVersion == null) {
+ return Result.success(null);
+ }
+ version = String.valueOf(maxVersion.getVersion());
}
if (StringUtils.isEmpty(fields)) {
@@ -328,4 +333,11 @@
return masterDataService.delete(tableName, whereSegment);
}
}
+
+
+
+ @RequestMapping(value = "{tableName}/getFieldVal/{field}", method = RequestMethod.GET)
+ public Result getFieldVal(@PathVariable String tableName, @PathVariable String field) {
+ return masterDataService.getFieldValByTable(tableName,field);
+ }
}
--
Gitblit v1.8.0