From 798ffd9065d72d76bb48a69ae91e81a19be8f22e Mon Sep 17 00:00:00 2001
From: 朱杰 <693337446@qq.com>
Date: 星期六, 22 五月 2021 23:29:15 +0800
Subject: [PATCH] fix 修复代码生成器中表字段取消必填无法更新问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 1519f3c..f156e4f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -6,10 +6,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
@@ -63,6 +66,16 @@
GenTable genTable = baseMapper.selectGenTableById(id);
setTableFromOptions(genTable);
return genTable;
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageGenTableList(PageUtils.buildPage(), genTable));
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageDbTableList(PageUtils.buildPage(), genTable));
}
/**
@@ -122,7 +135,16 @@
int row = baseMapper.updateById(genTable);
if (row > 0) {
for (GenTableColumn cenTableColumn : genTable.getColumns()) {
- genTableColumnMapper.updateById(cenTableColumn);
+ genTableColumnMapper.update(cenTableColumn,
+ new LambdaUpdateWrapper<GenTableColumn>()
+ .set(cenTableColumn.getIsPk() == null, GenTableColumn::getIsPk, null)
+ .set(cenTableColumn.getIsIncrement() == null, GenTableColumn::getIsIncrement, null)
+ .set(cenTableColumn.getIsInsert() == null, GenTableColumn::getIsInsert, null)
+ .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
+ .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
+ .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
+ .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
+ .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
}
@@ -437,4 +459,4 @@
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3