fix

controllers/company.go

@@ -788,7 +788,7 @@ func (this *CompanyController) List() {
 
 							// 是否包含共享客户(新增合同时, 关键词搜索客户为true)
 							if includeShare {
-								condition += ` AND (b.seller_id = ? OR (a.share_seller_id = ? AND a.is_share = 1)) `
+								condition += ` AND (b.seller_id = ? OR (b.share_seller_id = ? AND b.is_share = 1)) `
 								pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 							} else {
 								condition += ` AND b.seller_id=?  `

controllers/company_share.go

@@ -942,7 +942,7 @@ func (this *CompanyController) CompanyShareListByCity() {
 		}
 	}
 
-	condition += ` AND a.is_share=1 `
+	condition += ` AND b.is_share=1 `
 	if province != "" {
 		var provinceSql string
 		slice := strings.Split(province, ",")

models/company/company.go

@@ -102,7 +102,7 @@ type CompanySearchListResp struct {
 
 func GetCompanySearchList(condition string, pars []interface{}, limitParam ...int) (items []*CompanySearchItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT DISTINCT a.company_id,a.company_name,a.credit_code,a.company_code,a.region_type,a.share_seller_id,a.share_seller,a.is_share,
+	sql := `SELECT DISTINCT a.company_id,a.company_name,a.credit_code,a.company_code,a.region_type,b.share_seller_id,b.share_seller,b.is_share,
             GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/' ) AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
@@ -313,7 +313,7 @@ func GetCompanyList(condition, status, sortStr string, pars []interface{}, start
 	// 权益客户: 以权益最后一次阅读时间作为参考
 	t := time.Now().Local().AddDate(0, 0, -7).Format(utils.FormatDate)
 
-	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,a.address,a.region_type,b.group_id,b.road_show_total,a.is_share,
+	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,a.address,a.region_type,b.group_id,b.road_show_total,b.is_share,
 			CASE 
      WHEN GROUP_CONCAT(b.status) LIKE "%永续%" THEN 1
 	 WHEN GROUP_CONCAT(b.status) LIKE "%正式%" THEN 2
@@ -365,8 +365,8 @@ as sort_todo_end_time,
             b.freeze_time,b.freeze_reason,b.renewal_reason,
 			b.view_total,
 			b.last_view_time,
-			a.share_seller,
-			a.share_seller_id,
+			b.share_seller,
+			b.share_seller_id,
 			MAX(b.last_view_time) as max_last_view_time,
 			MIN(b.last_view_time) as min_last_view_time,
 			MAX(b.end_date) as max_end_date,

models/company/company_renewal_record.go

@@ -50,7 +50,7 @@ WHERE
 func GetUnusualRenewCompanyByShareSellerList(startDate, endDate time.Time, productId, source int) (list []*UnusualRenewCompanyGroup, err error) {
 	o := orm.NewOrm()
 	sql := `	SELECT
-	a.seller_id,a.share_seller_id,
+	a.seller_id,b.share_seller_id,
 	count(
 	DISTINCT ( a.company_id )) num,
 	GROUP_CONCAT( DISTINCT a.company_id SEPARATOR ',' ) AS company_ids 
@@ -62,7 +62,7 @@ WHERE
     AND a.source = ? 
 	AND a.product_id = ?
 GROUP BY
-	a.share_seller_id;
+	b.share_seller_id;
 `
 	_, err = o.Raw(sql, startDate, endDate, source, productId).QueryRows(&list)
 

models/roadshow/company.go

@@ -39,7 +39,7 @@ 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 AND b.product_id = 1
 			WHERE
-				b.status IN ('正式', '试用') AND (b.seller_id = ? OR a.share_seller_id = ?) AND a.company_name LIKE ?
+				b.status IN ('正式', '试用') AND (b.seller_id = ? OR b.share_seller_id = ?) AND a.company_name LIKE ?
 			GROUP BY
 				b.company_id`
 	_, err = o.Raw(sql, sellerId, sellerId, keyWord).QueryRows(&companies)

models/yb/comein_event.go

@@ -73,7 +73,7 @@ type ComeinEventItem struct {
 // GetComeinList 获取进门列表数据
 func GetComeinList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*ComeinEventItem, err error) {
 	o := orm.NewOrm()
-	sql := "select a.*,c.real_name as share_seller_name from comein_event a left join admin c on a.share_seller_id = c.admin_id " +
+	sql := "select a.*,c.real_name as share_seller_name from comein_event a left join admin c on b.share_seller_id = c.admin_id " +
 		" where 1=1  "
 	sql += condition
 	sql += ` order by a.start_time DESC,comein_event_id desc `