From 8c08d52a5f4a1feee68a479cf56cbb28f61040da Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 8 Jan 2020 10:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E6=B1=87=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 54aa8d85e..f1b8c3d23 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -723,8 +723,8 @@ class User < ApplicationRecord
   end
 
   def validate_sensitive_string
-    raise("真实姓名包含敏感词汇，请重新输入") unless HarmoniousDictionary.clean?(lastname)
-    raise("昵称包含敏感词汇，请重新输入") unless HarmoniousDictionary.clean?(nickname)
+    raise("真实姓名包含敏感词汇，请重新输入") if lastname && !HarmoniousDictionary.clean?(lastname)
+    raise("昵称包含敏感词汇，请重新输入") if nickname && !HarmoniousDictionary.clean?(nickname)
   end
 
   def set_laboratory