no message

controllers/statistic_company_merge.go

@@ -110,7 +110,8 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 
 	//条件
 	if adminId != "" {
-		condition += ` AND a.seller_id_init in  (` + adminId + `) `
+		//condition += ` AND a.seller_id_init in  (` + adminId + `) `
+		//condition += ` AND c.seller_id in  (` + adminId + `) `
 		//pars = append(pars, adminId)
 	} else {
 
@@ -215,6 +216,11 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		pars1 := pars
 		condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in ("add","receive") `
 		pars1 = append(pars1, startDate, endDate)
+		//销售筛选条件
+		if adminId != "" {
+			condition1 += ` AND c.seller_id in  (` + adminId + `) `
+		}
+
 		total, err := models.GetIncrementalCompanyCountByOperationRecord(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
@@ -252,6 +258,11 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		pars1 = append(pars1, startDate, endDate)
 		condition1 += ` AND a.rai_contract_type = ? `
 		pars1 = append(pars1, "新签合同")
+
+		//销售筛选条件
+		if adminId != "" {
+			condition1 += ` AND a.seller_id_init in  (` + adminId + `) `
+		}
 		newCompanyTotal, err = company.GetIncrementalNewCompanyProductMergeCount(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"