From 45b9acd57b8a52ebf134b061f03e70f49b1ea0c8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 11:32:02 +0800
Subject: [PATCH] fix 修复代码生成选择字典 无法取消问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 5fcdd3b..918f075 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
@@ -137,14 +137,17 @@
for (GenTableColumn cenTableColumn : genTable.getColumns()) {
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()));
+ .set(StrUtil.isBlank(cenTableColumn.getColumnComment()), GenTableColumn::getColumnComment, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsPk()), GenTableColumn::getIsPk, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsIncrement()), GenTableColumn::getIsIncrement, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsInsert()), GenTableColumn::getIsInsert, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsEdit()), GenTableColumn::getIsEdit, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsList()), GenTableColumn::getIsList, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsQuery()), GenTableColumn::getIsQuery, null)
+ .set(StrUtil.isBlank(cenTableColumn.getIsRequired()), GenTableColumn::getIsRequired, null)
+ .set(StrUtil.isBlank(cenTableColumn.getQueryType()), GenTableColumn::getQueryType, null)
+ .set(StrUtil.isBlank(cenTableColumn.getDictType()), GenTableColumn::getDictType, null)
+ .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
}
--
Gitblit v1.9.3