From d6688a367dc8dee7c489790daa5389de08e0531a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 09 七月 2024 10:42:40 +0800
Subject: [PATCH] !562 ♥️发布 5.2.1 正式版本 Merge pull request !562 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 77ef303..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
@@ -54,7 +54,6 @@
*
* @author Lion Li
*/
-// @DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -120,7 +119,7 @@
* 鏌ヨ鎹簱鍒楄〃
*
* @param tableNames 琛ㄥ悕绉扮粍
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
* @return 鏁版嵁搴撹〃闆嗗悎
*/
@DS("#dataName")
@@ -143,7 +142,6 @@
* 淇敼涓氬姟
*
* @param genTable 涓氬姟淇℃伅
- * @return 缁撴灉
*/
@Transactional(rollbackFor = Exception.class)
@Override
@@ -162,13 +160,12 @@
* 鍒犻櫎涓氬姟瀵硅薄
*
* @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
*/
@Transactional(rollbackFor = Exception.class)
@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));
}
@@ -176,16 +173,16 @@
* 瀵煎叆琛ㄧ粨鏋�
*
* @param tableList 瀵煎叆琛ㄥ垪琛�
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
*/
@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) {
@@ -335,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