Commit 945fb282dd5c4c677fb0c30fe24b7df04ad857b0

Authored by RuoYi
1 parent 2fd3cbbd

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

ruoyi/src/main/resources/vm/xml/mapper.xml.vm
... ... @@ -56,14 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
56 56 <trim prefix="(" suffix=")" suffixOverrides=",">
57 57 #foreach($column in $columns)
58 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 60 #end
61 61 #end
62 62 </trim>
63 63 <trim prefix="values (" suffix=")" suffixOverrides=",">
64 64 #foreach($column in $columns)
65 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 67 #end
68 68 #end
69 69 </trim>
... ... @@ -74,7 +74,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
74 74 <trim prefix="SET" suffixOverrides=",">
75 75 #foreach($column in $columns)
76 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 78 #end
79 79 #end
80 80 </trim>
... ...