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

controllers/company_seller.go

@@ -2333,7 +2333,8 @@ func (this *CompanySellerController) ShareSellerList() {
 	}
 	resp := make([]company.DepartmentGroupSellers, 0)
 
-	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID {
 		// 权益管理员，查看所有权益的账号
 		roleCodeTypeStr := `"` + utils.ROLE_TYPE_CODE_RAI_SELLER + `","` + utils.ROLE_TYPE_CODE_RAI_GROUP + `","` + utils.ROLE_TYPE_CODE_RAI_RESEARCHR + `","` + utils.ROLE_TYPE_CODE_RAI_ADMIN + `"`
 		departmentId := 5

controllers/company_share.go

@@ -212,10 +212,12 @@ func (this *CompanyController) CompanyShareList() {
 				if sysUser.GroupId == groupId {
 					condition += ` AND b.share_seller_id=? `
 					pars = append(pars, sysUser.AdminId)
-				} else {
-					condition += ` AND b.seller_id=? `
-					pars = append(pars, sysUser.AdminId)
 				}
+				// 在此页面销售只能看分配给自己的客户
+				//else {
+				//	condition += ` AND b.seller_id=? `
+				//	pars = append(pars, sysUser.AdminId)
+				//}
 			}
 		}
 	}