diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java index a96da547e..c7af8c570 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java @@ -74,7 +74,7 @@ public class UserController { @PostMapping("/resetPassword") public void resetPassword(@RequestBody UserReq userCmd, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) { User user = userService.getCurrentUser(request, response); userService.resetPassword(user.getName(), userCmd.getPassword(), userCmd.getNewPassword()); } diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java index 07e3b6666..12a644243 100644 --- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java @@ -49,6 +49,10 @@ public class QueryExpressionReplaceVisitor extends ExpressionVisitorAdapter { visitBinaryExpression(binaryExpression); } + if (expression instanceof Parenthesis) { + replace(expression, fieldExprMap); + } + if (!toReplace.isEmpty()) { Expression toReplaceExpr = getExpression(toReplace); if (Objects.nonNull(toReplaceExpr)) { diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java index 2db2977f6..9643f4ade 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java @@ -364,8 +364,10 @@ public class ModelServiceImpl implements ModelService { metaFilter.setModelIds(Lists.newArrayList(modelId)); List metricResps = metricService.getMetrics(metaFilter); List dimensionResps = dimensionService.getDimensions(metaFilter); - boolean validMetric = metricResps.stream().anyMatch(metricResp -> Objects.equals(metricResp.getStatus(), StatusEnum.ONLINE.getCode())); - boolean validDimension = dimensionResps.stream().anyMatch(dimensionResp -> Objects.equals(dimensionResp.getStatus(), StatusEnum.ONLINE.getCode())); + boolean validMetric = metricResps.stream().anyMatch( + metricResp -> Objects.equals(metricResp.getStatus(), StatusEnum.ONLINE.getCode())); + boolean validDimension = dimensionResps.stream().anyMatch(dimensionResp -> Objects + .equals(dimensionResp.getStatus(), StatusEnum.ONLINE.getCode())); if (validMetric || validDimension) { throw new RuntimeException("存在基于该模型创建的指标和维度, 暂不能删除, 请确认"); }