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

fix(数据集): 数据集sql变量

Browse Source
This commit is contained in:
taojinlong 2022-07-29 11:44:18 +08:00
parent d934726036
commit a9f6d0ac98
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1027,20 +1027,20 @@ public class DataSetTableService {
} }
plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString())); plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (CollectionUtils.isNotEmpty(select.getWithItemsList())) { if (CollectionUtils.isNotEmpty(select.getWithItemsList())) {
builder.append("WITH"); builder.append("WITH");
builder.append(" "); builder.append(" ");
} for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) { WithItem withItem = iter.next();
WithItem withItem = iter.next(); builder.append(withItem.toString());
builder.append(withItem.toString()); if (iter.hasNext()) {
if (iter.hasNext()) { builder.append(",");
builder.append(","); }
} }
} }
builder.append(plainSelect);
builder.append( " " + plainSelect);
return builder.toString(); return builder.toString();
} }

2
backend/src/main/java/io/dataease/service/dataset/PermissionService.java
View File

@ -183,7 +183,7 @@ public class PermissionService {
for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
columnPermissionsDTO.getWhiteListUser(); columnPermissionsDTO.getWhiteListUser();
List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {}.getType()); List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {}.getType());
if(!userIdList.contains(userId)){ if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){
roleColumnPermissionsDTOS.add(columnPermissionsDTO); roleColumnPermissionsDTOS.add(columnPermissionsDTO);
} }
} }