center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(X-Pack): 行权限

Browse Source
This commit is contained in:
junjun 2022-07-20 14:44:38 +08:00
parent c299ec76e5
commit bf8151201c
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -154,8 +154,11 @@ public class DorisQueryProvider extends QueryProvider {
if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (whereTrees != null) wheres.add(whereTrees);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (CollectionUtils.isNotEmpty(sortFields)) { if (CollectionUtils.isNotEmpty(sortFields)) {
@ -316,6 +319,8 @@ public class DorisQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -323,6 +328,7 @@ public class DorisQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -393,12 +399,15 @@ public class DorisQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -505,6 +514,8 @@ public class DorisQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -512,6 +523,7 @@ public class DorisQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -616,6 +628,8 @@ public class DorisQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -623,6 +637,7 @@ public class DorisQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -702,12 +717,15 @@ public class DorisQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(yFields); fields.addAll(yFields);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
// 外层再次套sql // 外层再次套sql
List<SQLObj> orders = new ArrayList<>(); List<SQLObj> orders = new ArrayList<>();

17
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -155,8 +155,10 @@ public class MysqlQueryProvider extends QueryProvider {
if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (whereTrees != null) wheres.add(whereTrees);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
if (CollectionUtils.isNotEmpty(sortFields)) { if (CollectionUtils.isNotEmpty(sortFields)) {
@ -317,6 +319,8 @@ public class MysqlQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -324,6 +328,7 @@ public class MysqlQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -394,12 +399,15 @@ public class MysqlQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -506,6 +514,8 @@ public class MysqlQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -513,6 +523,7 @@ public class MysqlQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -617,6 +628,8 @@ public class MysqlQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(xFields); fields.addAll(xFields);
@ -624,6 +637,7 @@ public class MysqlQueryProvider extends QueryProvider {
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
groups.addAll(xFields); groups.addAll(xFields);
// 外层再次套sql // 外层再次套sql
@ -703,12 +717,15 @@ public class MysqlQueryProvider extends QueryProvider {
String customWheres = transCustomFilterList(tableObj, fieldCustomFilter); String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
// 处理仪表板字段过滤 // 处理仪表板字段过滤
String extWheres = transExtFilterList(tableObj, extFilterRequestList); String extWheres = transExtFilterList(tableObj, extFilterRequestList);
// row permissions tree
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
// 构建sql所有参数 // 构建sql所有参数
List<SQLObj> fields = new ArrayList<>(); List<SQLObj> fields = new ArrayList<>();
fields.addAll(yFields); fields.addAll(yFields);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (extWheres != null) wheres.add(extWheres); if (extWheres != null) wheres.add(extWheres);
if (whereTrees != null) wheres.add(whereTrees);
List<SQLObj> groups = new ArrayList<>(); List<SQLObj> groups = new ArrayList<>();
// 外层再次套sql // 外层再次套sql
List<SQLObj> orders = new ArrayList<>(); List<SQLObj> orders = new ArrayList<>();