From 367d739e2d54b930e86a646f22711322b8bd1879 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 09 七月 2024 16:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index 8d0e38f..02a9fa7 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -165,7 +165,7 @@
@Override
public void deleteGenTableByIds(Long[] tableIds) {
List<Long> ids = Arrays.asList(tableIds);
- baseMapper.deleteBatchIds(ids);
+ baseMapper.deleteByIds(ids);
genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
}
@@ -178,11 +178,11 @@
@DSTransactional
@Override
public void importGenTable(List<GenTable> tableList, String dataName) {
- String operName = LoginHelper.getUsername();
+ Long operId = LoginHelper.getUserId();
try {
for (GenTable table : tableList) {
String tableName = table.getTableName();
- GenUtils.initTable(table, operName);
+ GenUtils.initTable(table, operId);
table.setDataName(dataName);
int row = baseMapper.insert(table);
if (row > 0) {
@@ -332,7 +332,7 @@
if (CollUtil.isNotEmpty(delColumns)) {
List<Long> ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId);
if (CollUtil.isNotEmpty(ids)) {
- genTableColumnMapper.deleteBatchIds(ids);
+ genTableColumnMapper.deleteByIds(ids);
}
}
}
--
Gitblit v1.9.3