From db43f678d86023e544215ddefa3d5ee5d9816695 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 四月 2021 19:02:51 +0800
Subject: [PATCH] !18 fix 代码生成器编辑问题 Merge pull request !18 from 疯狂的狮子li/dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..7fc96e2 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,6 +6,7 @@
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;
@@ -122,7 +123,15 @@
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)
+ .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
}
--
Gitblit v1.9.3