no message

controllers/company_share.go

@@ -67,7 +67,8 @@ func (this *CompanyController) CompanyShare() {
 	if req.IsShare == 0 {
 		companyProductItem.ShareSeller = ""
 		companyProductItem.ShareSellerId = 0
-		updateCol = append(updateCol, "ShareSeller", "ShareSellerId")
+		companyProductItem.ShareGroupId = 0
+		updateCol = append(updateCol, "ShareSeller", "ShareSellerId", "ShareGroupId")
 	}
 
 	err = companyProductItem.Update(updateCol)
@@ -221,7 +222,6 @@ func (this *CompanyController) CompanyShareList() {
 		}
 	}
 
-
 	if listParam == 0 {
 		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
 			sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
@@ -753,7 +753,8 @@ func (this *CompanyController) MoveShareSeller() {
 	updateCol := make([]string, 0)
 	companyProductItem.ShareSeller = seller.RealName
 	companyProductItem.ShareSellerId = seller.AdminId
-	updateCol = append(updateCol, "ShareSeller", "ShareSellerId")
+	companyProductItem.ShareGroupId = seller.GroupId
+	updateCol = append(updateCol, "ShareSeller", "ShareSellerId", "ShareGroupId")
 
 	err = companyProductItem.Update(updateCol)
 	if err != nil {

controllers/roadshow/company.go

@@ -33,7 +33,14 @@ func (this *CalendarController) CompanySearch() {
 		return
 	}
 	KeyWord = "%" + KeyWord + "%"
-	list, err := roadshow.CompanySearchV2(sysUser.AdminId, KeyWord)
+	var groupId int
+	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+		groupId = sysUser.GroupId
+	} else {
+		groupId = -1
+	}
+
+	list, err := roadshow.CompanySearchV2(sysUser.AdminId, groupId, KeyWord)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "搜索客户失败！"
 		br.ErrMsg = "搜索客户失败！Err:" + err.Error()

go.sum

@@ -392,6 +392,8 @@ github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXc
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -399,7 +401,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=

models/company/company_product.go

@@ -60,6 +60,7 @@ type CompanyProduct struct {
 	IsShare             int       `description:"0:非共享用户,1:共享客户"`
 	ShareSeller         string    `description:"共享销售员"`
 	ShareSellerId       int       `description:"共享销售员id"`
+	ShareGroupId        int       `description:"共享销售员所属分组ID"`
 }
 
 // 新增客户产品

models/roadshow/company.go

@@ -25,7 +25,7 @@ func CompanySearch(sellerId int, keyWord string) (list []*CompanySearchView, err
 	return
 }
 
-func CompanySearchV2(sellerId int, keyWord string) (list []*CompanySearchView, err error) {
+func CompanySearchV2(sellerId, groupId int, keyWord string) (list []*CompanySearchView, err error) {
 	list = make([]*CompanySearchView, 0)
 
 	// 中文客户
@@ -39,10 +39,10 @@ func CompanySearchV2(sellerId int, keyWord string) (list []*CompanySearchView, e
 				company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id 
 			WHERE
-				b.status IN ('正式', '试用') AND (b.seller_id = ? OR b.share_seller_id = ?) AND a.company_name LIKE ?
+				b.status IN ('正式', '试用') AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
 			GROUP BY
-				b.company_id`
-	_, err = o.Raw(sql, sellerId, sellerId, keyWord).QueryRows(&companies)
+				b.company_id `
+	_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)
 	if err != nil {
 		return
 	}