no message

controllers/statistic_report.go

@@ -2361,6 +2361,8 @@ func getHistoryStackCompanyList(sysUser *system.Admin, currentIndex, pageSize, i
 	condition += ` AND date = ? `
 	pars = append(pars, date)
 
+	var conditionAscribRai string // 处理权益未续约客户检索列表SQL查询条件
+	var parsAscribeRai []interface{}
 	//是否确认续约 CRM 13.9
 	if isConfirm != -1 {
 		var conditionConfirm string
@@ -2380,11 +2382,11 @@ func getHistoryStackCompanyList(sysUser *system.Admin, currentIndex, pageSize, i
 			}
 		}
 		if isConfirm == 0 {
-			condition += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
+			conditionAscribRai += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
 		} else {
-			condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
+			conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
 		}
-		pars = append(pars, companyIds)
+		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
 
 	//归因ID CRM 13.9
@@ -2406,8 +2408,8 @@ func getHistoryStackCompanyList(sysUser *system.Admin, currentIndex, pageSize, i
 				companyIds = append(companyIds, v.CompanyId)
 			}
 		}
-		condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
-		pars = append(pars, companyIds)
+		conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
+		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
 
 	if adminId != "" {
@@ -2503,7 +2505,8 @@ func getHistoryStackCompanyList(sysUser *system.Admin, currentIndex, pageSize, i
 			return
 		}
 		notRenewalCompanyTotal = total
-
+		condition1 += conditionAscribRai
+		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "未续约客户" {
 			//列表页数据总和
 			//统计数据
@@ -2945,7 +2948,8 @@ func getTodayStackCompanyListV2(sysUser *system.Admin, currentIndex, pageSize, i
 
 	today := utils.GetToday(utils.FormatDate)
 	//条件
-
+	var conditionAscribRai string // 处理权益未续约客户检索列表SQL查询条件
+	var parsAscribeRai []interface{}
 	//是否确认续约 CRM 13.9
 	if isConfirm != -1 {
 		var conditionConfirm string
@@ -2965,11 +2969,11 @@ func getTodayStackCompanyListV2(sysUser *system.Admin, currentIndex, pageSize, i
 			}
 		}
 		if isConfirm == 0 {
-			condition += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
+			conditionAscribRai += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
 		} else {
-			condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
+			conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
 		}
-		pars = append(pars, companyIds)
+		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
 
 	//归因ID CRM 13.9
@@ -2991,8 +2995,8 @@ func getTodayStackCompanyListV2(sysUser *system.Admin, currentIndex, pageSize, i
 				companyIds = append(companyIds, v.CompanyId)
 			}
 		}
-		condition += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
-		pars = append(pars, companyIds)
+		conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)`
+		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
 
 	if adminId != "" {
@@ -3104,7 +3108,8 @@ func getTodayStackCompanyListV2(sysUser *system.Admin, currentIndex, pageSize, i
 			return
 		}
 		notRenewalCompanyTotal = total
-
+		condition1 += conditionAscribRai
+		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "未续约客户" {
 			//页表页数据总和
 			//统计数据
@@ -3713,6 +3718,8 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		}
 		notRenewalCompanyTotal = total
 
+		condition1 += conditionAscribRai
+		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "未续约客户" {
 			//统计数据
 			for _, v := range []string{"试用", "非试用"} {
@@ -3755,8 +3762,7 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 			//	br.ErrMsg = "获取失败，Err:" + err.Error()
 			//	return
 			//}
-			condition1 += conditionAscribRai
-			pars1 = append(pars1, parsAscribeRai)
+
 			//分页total单独计算
 			total, err = models.GetIncrementalCompanyProductCountByOperationRecord(condition1, pars1)
 			if err != nil && err.Error() != utils.ErrNoRow() {