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/service/MasterDataService.java | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/MasterDataService.java b/src/main/java/com/highdatas/mdm/service/MasterDataService.java
index c2d54c5..c130479 100644
--- a/src/main/java/com/highdatas/mdm/service/MasterDataService.java
+++ b/src/main/java/com/highdatas/mdm/service/MasterDataService.java
@@ -1,10 +1,13 @@
package com.highdatas.mdm.service;
import com.highdatas.mdm.entity.Maintain;
+import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.pojo.SysAssembleUpdateType;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* @author kimi
@@ -17,45 +20,45 @@
Result selectById(String tableName, String id);
- Result selectList(String tableName);
+ Result selectList(TUser user, String tableName);
- Result selectList(String tableName, String whereSegment);
- Result selectList(String tableName, String whereSegment, String version);
+ Result selectList(TUser user, String tableName, String whereSegment);
+ Result selectList(TUser user, String tableName, String whereSegment, String version);
- Result selectList(String tableName, List<String> fieldList, String whereSegment);
- Result selectList(String tableName, List<String> fieldList, String whereSegment,String version);
+ Result selectList(TUser user, String tableName, List<String> fieldList, String whereSegment);
+ Result selectList(TUser user, String tableName, List<String> fieldList, String whereSegment,String version);
- Result selectList(String tableName, List<String> fields);
+ Result selectList(TUser user, String tableName, List<String> fields);
- Long getCountByVersion(String maintainId, String tableName, String tableTempName, Integer fromOrderNo, Integer toOrderNo, String whereSegment);
+ Long getCountByVersion(TUser user, String maintainId, String tableName, String tableTempName, Integer fromOrderNo, Integer toOrderNo, String whereSegment);
String getFields(String tableName);
- String getFields(String tableName, Maintain maintain);
+ String getFields(TUser user, String tableName, Maintain maintain);
String getFields(String tableName, String alias);
- String getFields(String tableName, String alias, Maintain maintain);
+ String getFields(TUser user, String tableName, String alias, Maintain maintain);
- String getTempFields(String tableName, Maintain maintain);
- String getTempFields(String tableName);
+ String getTempFields(TUser user, String tableName, Maintain maintain);
+ String getTempFields(TUser user, String tableName);
- String getTempFields(String tableName, String alias);
- String getTempFields(String tableName, String alias, Maintain maintain);
+ String getTempFields(TUser user, String tableName, String alias);
+ String getTempFields(TUser user, String tableName, String alias, Maintain maintain);
- Result selectListByPageByVersion(String tableName, Integer pageNo, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, Integer pageSize, boolean findMax);
- Result selectListByPageByVersion(String tableName, String whereSegment, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(String tableName, Integer pageNo, String version, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, String version, boolean findMax);
- Result selectListByPageByVersion(String tableName, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(String tableName, String whereSegment, Integer pageno, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageno, Integer pageSize, boolean findMax);
- Result selectListByPageByVersion(String tableName, List<String> fieldList, String whereSegment, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(String tableName, List<String> fieldList, Integer pageNo, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, Integer pageNo, boolean findMax);
- Result selectListByPageByVersion(String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, boolean findMax);
Result insert(String tableName, String fields, String jsonValues);
Result insert(String tableName, String json);
@@ -81,9 +84,15 @@
Result delete(String tableName, String whereSegment);
- Result selectListByPageByVersion(String tableName, String whereSegment, Integer pageNo, String version, boolean findMax);
+ Result selectListByPageByVersion(TUser user, String tableName, String whereSegment, Integer pageNo, String version, boolean findMax);
- Result selectListByPageByVersion(String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax);
+ List<Map<String, Object>> selectListByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, String version, boolean findMax);
+
+ Result selectListByPageByVersion(TUser user, String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax);
Maintain uploadedData(String tableName, SysAssembleUpdateType uploadType, String userId);
+ Maintain uploadedData(String tableName, SysAssembleUpdateType uploadType, String userId, boolean bigVersion);
+
+ Set<String> getFieldValByTable(String tableName, String field);
+ Set<String> getFieldValByMaintainField(String maintainFieldId, String field, String tableName);
}
--
Gitblit v1.8.0