Browse Source

fix:保存用户信息逻辑

zqbao 6 months ago
parent
commit
b81336757e
1 changed files with 12 additions and 12 deletions
  1. 12 12
      services/user.go

+ 12 - 12
services/user.go

@@ -167,20 +167,16 @@ func SaveUserInfo(userId, departmentId int, realName string) (msg string, err er
 	if err != nil {
 		return
 	}
+	if user.RealName == "" && realName == "" {
+		msg = "请输入姓名"
+		return
+	}
 	updateCols := make([]string, 0)
-	if user.RealName == "" {
-		if realName == "" {
-			msg = "请输入姓名"
-			return
-		}
+	if realName != "" && user.RealName != realName {
 		user.RealName = realName
 		updateCols = append(updateCols, "real_name")
 	}
-	if user.SellerDepartmentName == "" || user.SellerDepartmentId == 0 {
-		if departmentId <= 0 {
-			msg = "请选择营业部门"
-			return
-		}
+	if departmentId > 0 && user.SellerDepartmentId != departmentId {
 		department, er := models.GetSysDepartmentById(departmentId)
 		if er != nil {
 			err = er
@@ -205,10 +201,14 @@ func SaveUserInfo(userId, departmentId int, realName string) (msg string, err er
 			msg = "部门信息异常"
 			return
 		}
+		user.SellerDepartmentId = departmentId
 		user.SellerDepartmentName = department.SysDepartmentName
-		user.SellerDepartmentId = department.SysDepartmentId
-		updateCols = append(updateCols, "seller_department_name")
 		updateCols = append(updateCols, "seller_department_id")
+		updateCols = append(updateCols, "seller_department_name")
+	}
+	if (user.SellerDepartmentName == "" || user.SellerDepartmentId == 0) && departmentId <= 0 {
+		msg = "请选择营业部门"
+		return
 	}
 	err = user.Update(updateCols)
 	if err != nil {