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 1519f3c8d..7fc96e260 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 cn.hutool.core.util.StrUtil; 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 @@ public class GenTableServiceImpl extends ServiceImpl i int row = baseMapper.updateById(genTable); if (row > 0) { for (GenTableColumn cenTableColumn : genTable.getColumns()) { - genTableColumnMapper.updateById(cenTableColumn); + genTableColumnMapper.update(cenTableColumn, + new LambdaUpdateWrapper() + .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())); } } }