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 234ac51990..6c3b5e20b0 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2620,6 +2620,15 @@ public class DataSetTableService { } } + @Override + public void visit(Between between) { + if(hasVarible(between.getBetweenExpressionStart().toString()) || hasVarible(between.getBetweenExpressionEnd().toString())){ + getBuffer().append(SubstitutedSql); + }else { + getBuffer().append(between.getLeftExpression()).append(" BETWEEN ").append(between.getBetweenExpressionStart()).append(" AND ").append(between.getBetweenExpressionEnd()); + } + } + @Override public void visit(LikeExpression likeExpression) { if (hasVarible(likeExpression.toString())) { diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 2d534cfe58..8b8c47ef42 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -719,8 +719,8 @@ export default { } .normal { - color: #1f2329; - border: 1px solid #bbbfc4; + color: var(----deTextPrimary, #1F2329); + border: 1px solid var(--deBorderBase, #BBBFC4); margin-left: 12px; } @@ -755,9 +755,6 @@ export default { .name-email-search { width: 240px; - ::v-deep input { - border-color: #bbbfc4; - } } .active-btn {