From c0aa86327acac94b55e2f7c4fa193da4e38af986 Mon Sep 17 00:00:00 2001 From: jasmine <362055143@qq.com> Date: Wed, 11 Jun 2025 07:34:43 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix(extension/datapermission):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9E=84=E5=BB=BA=E6=9C=AC=E9=83=A8=E9=97=A8=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/DefaultDataPermissionHandler.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java index 2d0b185e..08d55ad9 100644 --- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java +++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java @@ -36,11 +36,7 @@ import net.sf.jsqlparser.expression.LongValue; import net.sf.jsqlparser.expression.StringValue; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; -import net.sf.jsqlparser.expression.operators.relational.EqualsTo; -import net.sf.jsqlparser.expression.operators.relational.ExpressionList; -import net.sf.jsqlparser.expression.operators.relational.InExpression; -import net.sf.jsqlparser.expression.operators.relational.LikeExpression; -import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList; +import net.sf.jsqlparser.expression.operators.relational.*; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.select.ParenthesedSelect; @@ -153,8 +149,8 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler { if (DatabaseType.MYSQL.getDatabase().equalsIgnoreCase(databaseType.getDatabase())) { Function findInSetFunction = new Function(); findInSetFunction.setName("find_in_set"); - findInSetFunction.setParameters(new ExpressionList<>(new LongValue(userContext - .getDeptId()), new StringValue(new Column("ancestors") + ","))); + findInSetFunction.setParameters(new ExpressionList(new LongValue(userContext + .getDeptId()), new Column("ancestors"))); inSetExpression = findInSetFunction; } else if (DatabaseType.POSTGRE_SQL.getDatabase().equalsIgnoreCase(databaseType.getDatabase())) { // 构建 concat 函数 From c01ba234634f4ec0f0acc7f8acbf81b30cc8ff59 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 13 Jun 2025 23:35:07 +0800 Subject: [PATCH 2/2] release: v2.12.2 --- CHANGELOG.md | 6 ++++++ continew-starter-bom/pom.xml | 2 +- continew-starter-dependencies/pom.xml | 2 +- .../handler/DefaultDataPermissionHandler.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78830ef7..5f83b2b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [v2.12.2](https://github.com/continew-org/continew-starter/compare/v2.12.1...v2.12.2) (2025-06-13) + +### 🐛 问题修复 + +- 【extension/datapermission】修复构建本部门及以下数据权限表达式问题。 (Gitee#65@httpsjt) ([c0aa863](https://github.com/continew-org/continew-starter/commit/c0aa86327acac94b55e2f7c4fa193da4e38af986)) + ## [v2.12.1](https://github.com/continew-org/continew-starter/compare/v2.12.0...v2.12.1) (2025-06-09) ### ✨ 新特性 diff --git a/continew-starter-bom/pom.xml b/continew-starter-bom/pom.xml index 6c9d7aff..5109b452 100644 --- a/continew-starter-bom/pom.xml +++ b/continew-starter-bom/pom.xml @@ -13,7 +13,7 @@ ContiNew Starter BOM - 2.12.1 + 2.12.2 diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index 728618b3..23ab8d45 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -14,7 +14,7 @@ - 2.12.1 + 2.12.2 3.3.11 2023.0.5 3.46.0 diff --git a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java index 08d55ad9..bd4cd9b0 100644 --- a/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java +++ b/continew-starter-extension/continew-starter-extension-datapermission/continew-starter-extension-datapermission-mp/src/main/java/top/continew/starter/extension/datapermission/handler/DefaultDataPermissionHandler.java @@ -150,7 +150,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler { Function findInSetFunction = new Function(); findInSetFunction.setName("find_in_set"); findInSetFunction.setParameters(new ExpressionList(new LongValue(userContext - .getDeptId()), new Column("ancestors"))); + .getDeptId()), new Column("ancestors"))); inSetExpression = findInSetFunction; } else if (DatabaseType.POSTGRE_SQL.getDatabase().equalsIgnoreCase(databaseType.getDatabase())) { // 构建 concat 函数