From fd60092f787f7e11b4bebddbd4d2bc6dc85864b4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 30 Oct 2023 18:18:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=A4=87=E6=B3=A8=E5=85=81=E8=AE=B8=E7=BD=AE?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/system/controller/sys_profile.go  |  4 ---
 .../system/repository/sys_menu.impl.go        |  4 +--
 .../system/repository/sys_role.impl.go        |  4 +--
 .../system/repository/sys_user.impl.go        | 25 ++++---------------
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/modules/system/controller/sys_profile.go b/src/modules/system/controller/sys_profile.go
index e0f59990..c2255522 100644
--- a/src/modules/system/controller/sys_profile.go
+++ b/src/modules/system/controller/sys_profile.go
@@ -120,8 +120,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
 			c.JSON(200, result.ErrMsg(msg))
 			return
 		}
-	} else {
-		body.PhoneNumber = "nil"
 	}
 
 	// 检查邮箱格式并判断是否唯一
@@ -138,8 +136,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
 			c.JSON(200, result.ErrMsg(msg))
 			return
 		}
-	} else {
-		body.Email = "nil"
 	}
 
 	// 用户基本资料
diff --git a/src/modules/system/repository/sys_menu.impl.go b/src/modules/system/repository/sys_menu.impl.go
index 4127c90f..5b62288f 100644
--- a/src/modules/system/repository/sys_menu.impl.go
+++ b/src/modules/system/repository/sys_menu.impl.go
@@ -387,9 +387,7 @@ func (r *SysMenuImpl) UpdateMenu(sysMenu model.SysMenu) int64 {
 	} else {
 		params["icon"] = "#"
 	}
-	if sysMenu.Remark != "" {
-		params["remark"] = sysMenu.Remark
-	}
+	params["remark"] = sysMenu.Remark
 	if sysMenu.UpdateBy != "" {
 		params["update_by"] = sysMenu.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()
diff --git a/src/modules/system/repository/sys_role.impl.go b/src/modules/system/repository/sys_role.impl.go
index ee4a2ae0..f417976c 100644
--- a/src/modules/system/repository/sys_role.impl.go
+++ b/src/modules/system/repository/sys_role.impl.go
@@ -248,9 +248,7 @@ func (r *SysRoleImpl) UpdateRole(sysRole model.SysRole) int64 {
 	if sysRole.Status != "" {
 		params["status"] = sysRole.Status
 	}
-	if sysRole.Remark != "" {
-		params["remark"] = sysRole.Remark
-	}
+	params["remark"] = sysRole.Remark
 	if sysRole.UpdateBy != "" {
 		params["update_by"] = sysRole.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()
diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go
index 7116632c..85c957f2 100644
--- a/src/modules/system/repository/sys_user.impl.go
+++ b/src/modules/system/repository/sys_user.impl.go
@@ -476,23 +476,10 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
 	if sysUser.Avatar != "" {
 		params["avatar"] = sysUser.Avatar
 	}
-	if sysUser.Email != "" {
-		if sysUser.Email == "nil" {
-			params["email"] = ""
-		} else {
-			params["email"] = sysUser.Email
-		}
-	}
-	if sysUser.PhoneNumber != "" {
-		if sysUser.PhoneNumber == "nil" {
-			params["phonenumber"] = ""
-		} else {
-			params["phonenumber"] = sysUser.PhoneNumber
-		}
-	}
-	if sysUser.Sex != "" {
-		params["sex"] = sysUser.Sex
-	}
+
+	params["email"] = sysUser.Email
+	params["phonenumber"] = sysUser.PhoneNumber
+	params["sex"] = sysUser.Sex
 	if sysUser.Password != "" {
 		password := crypto.BcryptHash(sysUser.Password)
 		params["password"] = password
@@ -500,9 +487,7 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
 	if sysUser.Status != "" {
 		params["status"] = sysUser.Status
 	}
-	if sysUser.Remark != "" {
-		params["remark"] = sysUser.Remark
-	}
+	params["remark"] = sysUser.Remark
 	if sysUser.UpdateBy != "" {
 		params["update_by"] = sysUser.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()