From d9367425fac44291296a226f2ee81c03becc48cb Mon Sep 17 00:00:00 2001 From: jack <5120499+jack_kui@user.noreply.gitee.com> Date: 星期四, 02 七月 2020 18:03:18 +0800 Subject: [PATCH] 令牌秘钥的“秘”写错了,看到顺手就提交了哈 --- ruoyi/src/main/resources/vm/xml/mapper.xml.vm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi/src/main/resources/vm/xml/mapper.xml.vm index ef9d682..6c490a4 100644 --- a/ruoyi/src/main/resources/vm/xml/mapper.xml.vm +++ b/ruoyi/src/main/resources/vm/xml/mapper.xml.vm @@ -56,14 +56,14 @@ <trim prefix="(" suffix=")" suffixOverrides=","> #foreach($column in $columns) #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">$column.columnName,</if> + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if> #end #end </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> #foreach($column in $columns) #if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">#{$column.javaField},</if> + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if> #end #end </trim> @@ -74,7 +74,7 @@ <trim prefix="SET" suffixOverrides=","> #foreach($column in $columns) #if($column.columnName != $pkColumn.columnName) - <if test="$column.javaField != null #if($column.javaType == 'String' ) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if> + <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if> #end #end </trim> -- Gitblit v1.9.2