fix:调整用户编辑逻辑

controllers/user.go

@@ -102,8 +102,8 @@ func (this *UserController) Add() {
 			}
 		}
 	}
-	if req.SellerId <= 0 {
-		br.Msg = "请选择营业部/销售"
+	if req.SellerDepartmentId <= 0 {
+		br.Msg = "请选择营业部"
 		return
 	}
 	if req.ValidStartTime == "" || req.ValidEndTime == "" {
@@ -154,12 +154,19 @@ func (this *UserController) Add() {
 		br.Msg = "有效期截至时间必须大于当前时间"
 		return
 	}
+	sysDepartment, err := models.GetSysDepartmentById(req.SellerDepartmentId)
+	if err != nil {
+		br.Msg = "添加用户失败"
+		br.ErrMsg = "查询营业部失败，系统错误，Err:" + err.Error()
+		return
+	}
 
 	user.RealName = req.RealName
 	user.AreaCode = req.AreaCode
 	user.Phone = req.Phone
 	user.Email = req.Email
-	user.SellerId = req.SellerId
+	user.SellerDepartmentId = req.SellerDepartmentId
+	user.SellerDepartmentName = sysDepartment.SysDepartmentName
 	user.ValidStartTime = validStartTime
 	user.ValidEndTime = validEndTime
 	user.Company = req.Company
@@ -250,8 +257,8 @@ func (this *UserController) Edit() {
 			return
 		}
 	}
-	if req.SellerId <= 0 {
-		br.Msg = "请选择营业部/销售"
+	if req.SellerDepartmentId <= 0 {
+		br.Msg = "请选择营业部"
 		return
 	}
 	if req.ValidStartTime == "" || req.ValidEndTime == "" {
@@ -296,11 +303,19 @@ func (this *UserController) Edit() {
 		br.ErrMsg = "编辑用户失败, 系统错误，Err:" + err.Error()
 		return
 	}
+
+	sysDepartment, err := models.GetSysDepartmentById(req.SellerDepartmentId)
+	if err != nil {
+		br.Msg = "添加用户失败"
+		br.ErrMsg = "查询营业部失败，系统错误，Err:" + err.Error()
+		return
+	}
 	user.RealName = req.RealName
 	user.AreaCode = req.AreaCode
 	user.Phone = req.Phone
 	user.Email = req.Email
-	user.SellerId = req.SellerId
+	user.SellerDepartmentId = req.SellerDepartmentId
+	user.SellerDepartmentName = sysDepartment.SysDepartmentName
 	user.ValidStartTime = validStartTime
 	user.ValidEndTime = validEndTime
 	user.Company = req.Company
@@ -794,8 +809,8 @@ func (this *UserController) PotentialEdit() {
 			return
 		}
 	}
-	if req.SellerId <= 0 {
-		br.Msg = "请选择营业部/销售"
+	if req.SellerDepartmentId <= 0 {
+		br.Msg = "请选择营业部"
 		return
 	}
 	if req.ValidStartTime == "" || req.ValidEndTime == "" {
@@ -840,11 +855,18 @@ func (this *UserController) PotentialEdit() {
 		br.ErrMsg = "编辑用户失败, 系统错误，Err:" + err.Error()
 		return
 	}
+	department, err := models.GetSysDepartmentById(req.SellerDepartmentId)
+	if err != nil {
+		br.Msg = "编辑用户失败"
+		br.ErrMsg = "编辑用户失败, 系统错误，Err:" + err.Error()
+		return
+	}
 	user.RealName = req.RealName
 	user.AreaCode = req.AreaCode
 	user.Phone = req.Phone
 	user.Email = req.Email
-	user.SellerId = req.SellerId
+	user.SellerDepartmentId = req.SellerDepartmentId
+	user.SellerDepartmentName = department.SysDepartmentName
 	user.ValidStartTime = validStartTime
 	user.ValidEndTime = validEndTime
 	user.Company = req.Company

models/request/user.go

@@ -1,29 +1,29 @@
 package request
 
 type UserAddReq struct {
-	RealName        string `description:"姓名"`
-	AreaCode        string `description:"区号"`
-	Phone           string `description:"手机号"`
-	Email           string `description:"邮箱"`
-	SellerId        int    `description:"销售id"`
-	ValidStartTime  string `description:"有效期开始时间"`
-	ValidEndTime    string `description:"有效期结束时间"`
-	Company         string `description:"所属公司"`
-	ChartPermission []int  `description:"所选品种"`
+	RealName           string `description:"姓名"`
+	AreaCode           string `description:"区号"`
+	Phone              string `description:"手机号"`
+	Email              string `description:"邮箱"`
+	SellerDepartmentId int    `description:"营业部门id"`
+	ValidStartTime     string `description:"有效期开始时间"`
+	ValidEndTime       string `description:"有效期结束时间"`
+	Company            string `description:"所属公司"`
+	ChartPermission    []int  `description:"所选品种"`
 }
 
 type UserEditReq struct {
-	UserId          int    `description:"用户id"`
-	RealName        string `description:"姓名"`
-	AreaCode        string `description:"区号"`
-	Phone           string `description:"手机号"`
-	Email           string `description:"邮箱"`
-	SellerId        int    `description:"销售id"`
-	ValidStartTime  string `description:"有效期开始时间"`
-	ValidEndTime    string `description:"有效期结束时间"`
-	Company         string `description:"所属公司"`
-	ChartPermission []int  `description:"所选品种"`
-	IsEnabled       bool   `description:"是否禁用"`
+	UserId             int    `description:"用户id"`
+	RealName           string `description:"姓名"`
+	AreaCode           string `description:"区号"`
+	Phone              string `description:"手机号"`
+	Email              string `description:"邮箱"`
+	SellerDepartmentId int    `description:"营业部门id"`
+	ValidStartTime     string `description:"有效期开始时间"`
+	ValidEndTime       string `description:"有效期结束时间"`
+	Company            string `description:"所属公司"`
+	ChartPermission    []int  `description:"所选品种"`
+	IsEnabled          bool   `description:"是否禁用"`
 }
 
 type UserCheckReq struct {