Merge branch 'crm/crm_need_960' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

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()

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
 	}