欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 945fb282dd5c4c677fb0c30fe24b7df04ad857b0 1 个父辈 2fd3cbbd

代码生成模板调整，字段为String并且必填则加空串条件

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 3 行删除
@@ -56,14 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -56,14 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
56 <trim prefix="(" suffix=")" suffixOverrides=","> 56 <trim prefix="(" suffix=")" suffixOverrides=",">
57 #foreach($column in $columns) 57 #foreach($column in $columns)
58 #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) 58 #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
59 - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">$column.columnName,</if> 59 + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
60 #end 60 #end
61 #end 61 #end
62 </trim> 62 </trim>
63 <trim prefix="values (" suffix=")" suffixOverrides=","> 63 <trim prefix="values (" suffix=")" suffixOverrides=",">
64 #foreach($column in $columns) 64 #foreach($column in $columns)
65 #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) 65 #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
66 - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">#{$column.javaField},</if> 66 + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
67 #end 67 #end
68 #end 68 #end
69 </trim> 69 </trim>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
74 <trim prefix="SET" suffixOverrides=","> 74 <trim prefix="SET" suffixOverrides=",">
75 #foreach($column in $columns) 75 #foreach($column in $columns)
76 #if($column.columnName != $pkColumn.columnName) 76 #if($column.columnName != $pkColumn.columnName)
77 - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if> 77 + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
78 #end 78 #end
79 #end 79 #end
80 </trim> 80 </trim>