Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend

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"
 	}
 
 	// 用户基本资料

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()

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()

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()