From 8052d759570bcf6a01aac55733365c8c306623a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 17 一月 2022 15:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 16 ++++++++++++----
ruoyi-ui/src/views/register.vue | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
ruoyi-ui/src/views/login.vue | 2 +-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ab692f0..8c0b6e4 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -5,7 +5,7 @@
# 鐗堟湰
version: ${ruoyi-vue-plus.version}
# 鐗堟潈骞翠唤
- copyrightYear: 2021
+ copyrightYear: 2022
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鑾峰彇ip鍦板潃寮�鍏�
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 93f7260..fec79a3 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
@@ -277,7 +277,7 @@
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns();
- List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
+ Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
if (StringUtils.isEmpty(dbTableColumns)) {
@@ -287,9 +287,17 @@
List<GenTableColumn> saveColumns = new ArrayList<>();
dbTableColumns.forEach(column -> {
- if (!tableColumnNames.contains(column.getColumnName())) {
- GenUtils.initColumnField(column, table);
- saveColumns.add(column);
+ GenUtils.initColumnField(column, table);
+ if (tableColumnMap.containsKey(column.getColumnName())) {
+ GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+ column.setColumnId(prevColumn.getColumnId());
+ if (column.isList()) {
+ // 濡傛灉鏄垪琛紝缁х画淇濈暀瀛楀吀绫诲瀷
+ column.setDictType(prevColumn.getDictType());
+ }
+ genTableColumnMapper.updateGenTableColumn(column);
+ } else {
+ genTableColumnMapper.insertGenTableColumn(column);
}
});
if (CollUtil.isNotEmpty(saveColumns)) {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 4df8936..3665604 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -56,7 +56,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 7599314..4fc9b9c 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -61,7 +61,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-register-footer">
- <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
--
Gitblit v1.9.3