fix: 联系人销售

controllers/users.go

@@ -66,37 +66,43 @@ func (this *UsersController) Add() {
 		return
 	}
 	// 销售如果是空的那么创建人即为销售
-	var sellerName, companyName string
-	if req.SellerId <= 0 {
-		req.SellerId = sysUser.SysUserId
-		sellerName = sysUser.SysRealName
-	}
+	var (
+		sellerId                int
+		sellerName, companyName string
+	)
 	if req.SellerId > 0 {
-		sellerItem, e := models.GetSysUserById(req.SellerId)
+		sellerId = req.SellerId
+	}
+	if req.CompanyId > 0 {
+		companyOb := new(models.Company)
+		companyItem, e := companyOb.GetItemById(req.CompanyId)
 		if e != nil {
 			if e.Error() == utils.ErrNoRow() {
-				br.Msg = "所选营业部不存在，请刷新页面"
+				br.Msg = "所选机构不存在，请刷新页面"
 				return
 			}
 			br.Msg = "操作失败"
-			br.ErrMsg = fmt.Sprintf("获取营业部销售失败, %v", e)
+			br.ErrMsg = fmt.Sprintf("获取机构失败, %v", e)
 			return
 		}
-		sellerName = sellerItem.SysRealName
+		companyName = companyItem.CompanyName
+		// 未传销售ID那么取机构销售
+		if sellerId <= 0 {
+			sellerId = companyItem.SellerId
+		}
 	}
-	if req.CompanyId > 0 {
-		companyOb := new(models.Company)
-		companyItem, e := companyOb.GetItemById(req.CompanyId)
+	if sellerId > 0 {
+		sellerItem, e := models.GetSysUserById(req.SellerId)
 		if e != nil {
 			if e.Error() == utils.ErrNoRow() {
-				br.Msg = "所选机构不存在，请刷新页面"
+				br.Msg = "所选营业部不存在，请刷新页面"
 				return
 			}
 			br.Msg = "操作失败"
-			br.ErrMsg = fmt.Sprintf("获取机构失败, %v", e)
+			br.ErrMsg = fmt.Sprintf("获取营业部销售失败, %v", e)
 			return
 		}
-		companyName = companyItem.CompanyName
+		sellerName = sellerItem.SysRealName
 	}
 
 	// 校验手机号是否存在
@@ -120,7 +126,7 @@ func (this *UsersController) Add() {
 	usersOb.RealName = req.RealName
 	usersOb.Mobile = req.Mobile
 	usersOb.AreaCode = req.AreaCode
-	usersOb.SellerId = req.SellerId
+	usersOb.SellerId = sellerId
 	usersOb.SellerName = sellerName
 	usersOb.SysUserId = sysUser.SysUserId
 	usersOb.SysUserRealName = sysUser.SysRealName
@@ -801,11 +807,9 @@ func (this *UsersController) PageList() {
 
 	// 筛选项
 	{
-		// 机构
-		if params.CompanyId > 0 {
-			cond += fmt.Sprintf(` AND %s = ?`, usersOb.Cols().CompanyId)
-			pars = append(pars, params.CompanyId)
-		}
+		// 机构，默认为个人
+		cond += fmt.Sprintf(` AND %s = ?`, usersOb.Cols().CompanyId)
+		pars = append(pars, params.CompanyId)
 
 		// 用户类型
 		if params.UserStatus > 0 {