From 01d9af671dd266dd53b396ef5f1114cc517309c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 12 Nov 2020 17:12:33 +0800
Subject: [PATCH] qq

---
 business/jxstore/cms/user2.go   | 2 +-
 controllers/user2_controller.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 30c7c4151..e96fc01cc 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -213,7 +213,7 @@ func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, er
 func CreateUser(user *model.User, creatorName string) (err error) {
 	globals.SugarLogger.Debugf("CreateUser user:%s, creatorName:%s", utils.Format4Output(user, true), creatorName)
 
-	if user == nil || user.UserID2 == "" {
+	if user == nil || user.UserID2 == "" || user.Name == "" {
 		return ErrUserIDAndNameMustGiven
 	}
 	if user.GetMobile() == "" {
diff --git a/controllers/user2_controller.go b/controllers/user2_controller.go
index 1878b2b11..53b6f843c 100644
--- a/controllers/user2_controller.go
+++ b/controllers/user2_controller.go
@@ -262,9 +262,9 @@ func (c *User2Controller) UpdateUserByMiniInfo() {
 						if userInfo.PurePhoneNumber != "" {
 							user.Mobile = utils.String2Pointer(userInfo.PurePhoneNumber)
 						}
-						if userInfo.NickName != "" {
-							user.Name = userInfo.NickName
-						}
+						// if userInfo.NickName != "" {
+						// 	user.Name = userInfo.NickName
+						// }
 						_, err = dao.UpdateEntity(dao.GetDB(), user)
 						if err != nil && dao.IsDuplicateError(err) {
 							if mobileAuth, err2 := auth2.LoginInternal(params.Ctx.Context, auth2.AuthTypeMobile, userInfo.PurePhoneNumber, auth2.UserIDMobile, auth2.InternalAuthSecret); err2 == nil {