From a9f6d0ac9833ed46ee66569da90c492f80021c51 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 29 Jul 2022 11:44:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86sql=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 16 ++++++++-------- .../service/dataset/PermissionService.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 22c7467a94..234ac51990 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1027,20 +1027,20 @@ public class DataSetTableService { } plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString())); - StringBuilder builder = new StringBuilder(); if (CollectionUtils.isNotEmpty(select.getWithItemsList())) { builder.append("WITH"); builder.append(" "); - } - for (Iterator iter = select.getWithItemsList().iterator(); iter.hasNext();) { - WithItem withItem = iter.next(); - builder.append(withItem.toString()); - if (iter.hasNext()) { - builder.append(","); + for (Iterator iter = select.getWithItemsList().iterator(); iter.hasNext();) { + WithItem withItem = iter.next(); + builder.append(withItem.toString()); + if (iter.hasNext()) { + builder.append(","); + } } } - builder.append(plainSelect); + + builder.append( " " + plainSelect); return builder.toString(); } diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java index e7150ac2dd..8498a80674 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -183,7 +183,7 @@ public class PermissionService { for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { columnPermissionsDTO.getWhiteListUser(); List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() {}.getType()); - if(!userIdList.contains(userId)){ + if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){ roleColumnPermissionsDTOS.add(columnPermissionsDTO); } }