admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

v1.2.1 release (^.^)YYa!!

Browse Source
This commit is contained in:
开源海哥 2023-05-06 16:23:24 +08:00
parent 4efcc69411
commit 89ea36d58e
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
View File

@ -527,6 +527,25 @@ public class TableInfo {
CPI.putContext(queryWrapper, APPEND_CONDITIONS_FLAG, Boolean.TRUE);
}
//select * from (select ... from ) 中的子查询处理
List<QueryTable> queryTables = CPI.getQueryTables(queryWrapper);
if (queryTables != null && !queryTables.isEmpty()) {
for (QueryTable queryTable : queryTables) {
if (queryTable instanceof SelectQueryTable) {
QueryWrapper selectQueryWrapper = ((SelectQueryTable) queryTable).getQueryWrapper();
List<QueryTable> selectQueryTables = CPI.getQueryTables(selectQueryWrapper);
if (selectQueryTables != null && !selectQueryTables.isEmpty()) {
for (QueryTable selectQueryTable : selectQueryTables) {
TableInfo tableInfo = TableInfoFactory.ofTableName(selectQueryTable.getName());
if (tableInfo != null) {
tableInfo.appendConditions(entity, selectQueryWrapper);
}
}
}
}
}
}
//添加乐观锁条件，只有在 update 的时候进行处理
if (StringUtil.isNotBlank(versionColumn) && entity != null) {
Object versionValue = buildColumnSqlArg(entity, versionColumn);
@ -536,7 +555,7 @@ public class TableInfo {
queryWrapper.and(QueryCondition.create(tableName, versionColumn, QueryCondition.LOGIC_EQUALS, versionValue));
}
//逻辑删除条件，已删除的数据不能被修改
//逻辑删除
if (StringUtil.isNotBlank(logicDeleteColumn)) {
queryWrapper.and(QueryCondition.create(tableName, logicDeleteColumn, QueryCondition.LOGIC_EQUALS
, FlexGlobalConfig.getDefaultConfig().getNormalValueOfLogicDelete()));
@ -556,8 +575,8 @@ public class TableInfo {
List<QueryWrapper> childSelects = CPI.getChildSelect(queryWrapper);
if (CollectionUtil.isNotEmpty(childSelects)) {
for (QueryWrapper childQueryWrapper : childSelects) {
List<QueryTable> queryTables = CPI.getQueryTables(childQueryWrapper);
for (QueryTable queryTable : queryTables) {
List<QueryTable> childQueryTables = CPI.getQueryTables(childQueryWrapper);
for (QueryTable queryTable : childQueryTables) {
TableInfo tableInfo = TableInfoFactory.ofTableName(queryTable.getName());
if (tableInfo != null) {
tableInfo.appendConditions(entity, childQueryWrapper);
@ -571,8 +590,8 @@ public class TableInfo {
if (CollectionUtil.isNotEmpty(unions)) {
for (UnionWrapper union : unions) {
QueryWrapper unionQueryWrapper = union.getQueryWrapper();
List<QueryTable> queryTables = CPI.getQueryTables(unionQueryWrapper);
for (QueryTable queryTable : queryTables) {
List<QueryTable> unionQueryTables = CPI.getQueryTables(unionQueryWrapper);
for (QueryTable queryTable : unionQueryTables) {
TableInfo tableInfo = TableInfoFactory.ofTableName(queryTable.getName());
if (tableInfo != null) {
tableInfo.appendConditions(entity, unionQueryWrapper);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
View File

@ -89,7 +89,7 @@ public class TableInfoFactory {
public static TableInfo ofTableName(String tableName) {
return tableInfoMap.get(tableName);
return StringUtil.isNotBlank(tableName) ? tableInfoMap.get(tableName) : null;
}