Переглянути джерело

fix: 用户编辑,转正式

hsun 2 тижнів тому
батько
коміт
32a8e0a130
2 змінених файлів з 25 додано та 13 видалено
  1. 12 13
      controllers/sys_user.go
  2. 13 0
      controllers/users.go

+ 12 - 13
controllers/sys_user.go

@@ -283,22 +283,21 @@ func (this *SysUserController) Edit() {
 		br.ErrMsg = "获得分组路径失败,系统错误,Err:" + err.Error()
 		return
 	}
-	switch len(depPathIds) {
-	case 1:
+	if len(depPathIds) < 3 {
+		br.Msg = "部门有误"
+		return
+	}
+	sysUser.SysDepartmentId1 = depPathIds[0]
+	sysUser.SysDepartmentId2 = depPathIds[1]
+	sysUser.SysDepartmentId3 = depPathIds[2]
+	if depPathIds[0] != 0 {
 		sysUser.SysDepartmentId = depPathIds[0]
-		sysUser.SysDepartmentId1 = depPathIds[0]
-	case 2:
+	}
+	if depPathIds[1] != 0 {
 		sysUser.SysDepartmentId = depPathIds[1]
-		sysUser.SysDepartmentId1 = depPathIds[0]
-		sysUser.SysDepartmentId2 = depPathIds[1]
-	case 3:
+	}
+	if depPathIds[2] != 0 {
 		sysUser.SysDepartmentId = depPathIds[2]
-		sysUser.SysDepartmentId1 = depPathIds[0]
-		sysUser.SysDepartmentId2 = depPathIds[1]
-		sysUser.SysDepartmentId3 = depPathIds[2]
-	default:
-		br.Msg = "部门有误"
-		return
 	}
 
 	var roleName string

+ 13 - 0
controllers/users.go

@@ -634,6 +634,19 @@ func (this *UsersController) TransFormal() {
 			return
 		}
 		authStatus = models.AuthStatusOpen
+
+		seller, e := models.GetSysUserById(req.SellerId)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "销售不存在,请刷新页面后重试"
+				return
+			}
+			br.Msg = "操作失败"
+			br.ErrMsg = fmt.Sprintf("获取销售失败, %v", e)
+			return
+		}
+		sellerId = req.SellerId
+		sellerName = seller.SysRealName
 	case models.UserTypeCompany:
 		if req.CompanyId <= 0 {
 			br.Msg = "请选择所属机构"