ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dftre 2024-05-18 23:45:51 +08:00
parent 7187171173
commit cd8201c5d7
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java
View File

@ -14,8 +14,20 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
public @interface EnableTableMap { public @interface EnableTableMap {
String name() default "t"; String name() default "t";
String dept() default ""; String dept() default "";
String user() default ""; String user() default "";
String userOn() default "user_id";
String userOn() default "";
String userOnLeft() default "create_by";
String userOnRight() default "user_name";
String deptOn() default "dept_id"; String deptOn() default "dept_id";
String deptOnLeft() default "";
String deptOnRight() default "";
} }

27
ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java
View File

@ -60,16 +60,35 @@ public class TableInfo {
.forEach(joinSql::add); .forEach(joinSql::add);
if (this.enableTableMap != null) { if (this.enableTableMap != null) {
if (StringUtils.isNotEmpty(this.enableTableMap.user())) { if (StringUtils.isNotEmpty(this.enableTableMap.user())) {
String left = "";
String right = "";
if (StringUtils.isEmpty(this.enableTableMap.deptOn())) {
left = this.enableTableMap.userOn();
right = this.enableTableMap.userOn();
} else {
left = this.enableTableMap.userOnLeft();
right = this.enableTableMap.userOnRight();
}
this.joinSql.add("sys_user " + this.enableTableMap.user() + " on " this.joinSql.add("sys_user " + this.enableTableMap.user() + " on "
+ this.enableTableMap.user() + "." + this.enableTableMap.userOn() + " = " + this.enableTableMap.user() + "." + right + " = "
+ this.getTableNameT() + "." + this.enableTableMap.userOn()); + this.getTableNameT() + "." + left);
this.hasDataScopeValue = true; this.hasDataScopeValue = true;
} }
if (StringUtils.isNotEmpty(this.enableTableMap.dept())) { if (StringUtils.isNotEmpty(this.enableTableMap.dept())) {
String left = "";
String right = "";
if (StringUtils.isEmpty(this.enableTableMap.deptOn())) {
left = this.enableTableMap.deptOn();
right = this.enableTableMap.deptOn();
} else {
left = this.enableTableMap.deptOnLeft();
right = this.enableTableMap.deptOnRight();
}
this.joinSql.add("sys_dept " + this.enableTableMap.dept() + " on " this.joinSql.add("sys_dept " + this.enableTableMap.dept() + " on "
+ this.enableTableMap.dept() + "." + this.enableTableMap.deptOn() + " = " + this.enableTableMap.dept() + "." + right + " = "
+ this.getTableNameT() + "." + this.enableTableMap.deptOn()); + this.getTableNameT() + "." + left);
this.hasDataScopeValue = true; this.hasDataScopeValue = true;
} }
} }