diff --git a/vol.api.sqlsugar/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/vol.api.sqlsugar/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index a1508f03..08c88ed1 100644 --- a/vol.api.sqlsugar/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/vol.api.sqlsugar/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -1457,19 +1457,8 @@ DISTINCT public async Task DelTree(int table_Id) { if (table_Id == 0) return new WebResponseContent().Error("没有传入参数"); - Sys_TableInfo tableInfo = await repository.FindAsIQueryable(x => x.Table_Id == table_Id) - .Includes(c => c.TableColumns) - .FirstOrDefaultAsync(); - if (tableInfo == null) return new WebResponseContent().OK(); - if (tableInfo.TableColumns != null && tableInfo.TableColumns.Count > 0) - { - return new WebResponseContent().Error("当前删除的节点存在表结构信息,只能删除空节点"); - } - if (repository.Exists(x => x.ParentId == table_Id)) - { - return new WebResponseContent().Error("当前删除的节点存在子节点,不能删除"); - } - repository.Delete(tableInfo, true); + await repository.DbContext.Deleteable().Where(x => x.Table_Id == table_Id).ExecuteCommandAsync(); + await repository.DbContext.Deleteable().Where(x => x.Table_Id == table_Id).ExecuteCommandAsync(); return new WebResponseContent().OK(); } diff --git a/vol.api/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/vol.api/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index ea62eeaa..0f0d1fec 100644 --- a/vol.api/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/vol.api/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -1672,19 +1672,8 @@ DISTINCT public async Task DelTree(int table_Id) { if (table_Id == 0) return new WebResponseContent().Error("没有传入参数"); - Sys_TableInfo tableInfo = (await repository.FindAsIQueryable(x => x.Table_Id == table_Id) - .Include(c => c.TableColumns) - .ToListAsync()).FirstOrDefault(); - if (tableInfo == null) return new WebResponseContent().OK(); - if (tableInfo.TableColumns != null && tableInfo.TableColumns.Count > 0) - { - return new WebResponseContent().Error("当前删除的节点存在表结构信息,只能删除空节点"); - } - if (repository.Exists(x => x.ParentId == table_Id)) - { - return new WebResponseContent().Error("当前删除的节点存在子节点,不能删除"); - } - repository.Delete(tableInfo, true); + await repository.FindAsIQueryable(x => x.Table_Id == table_Id).ExecuteDeleteAsync(); + await repository.DbContext.Set().Where(x => x.Table_Id == table_Id).ExecuteDeleteAsync(); return new WebResponseContent().OK(); }