From ec3b008e2b36093c044afbbc0d9bcd1a5dd819a0 Mon Sep 17 00:00:00 2001 From: dftre <3066417822@qq.com> Date: Wed, 30 Oct 2024 09:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java | 2 ++ .../src/main/java/com/ruoyi/mybatis/domain/TableInfo.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java index cc3d746..2e6a887 100644 --- a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java +++ b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java @@ -30,4 +30,6 @@ public @interface EnableTableMap { String deptOnLeft() default ""; String deptOnRight() default ""; + + String deptFrom() default ""; } diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java index 7dfc74d..c9fff1b 100644 --- a/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java +++ b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java @@ -84,7 +84,8 @@ public class TableInfo { if (StringUtils.isNotEmpty(this.enableTableMap.dept())) { String lf = this.enableTableMap.deptOnLeft(); String rf = this.enableTableMap.deptOnRight(); - String lt = this.getTableNameT(); + String lt = StringUtils.isNotEmpty(this.enableTableMap.deptFrom()) ? this.enableTableMap.deptFrom() + : this.getTableNameT(); String rt = this.enableTableMap.dept(); if (StringUtils.isEmpty(lf) || StringUtils.isEmpty(rf)) { lf = this.enableTableMap.deptOn();