no message

controllers/statistic_company_merge.go

@@ -303,6 +303,10 @@ 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 + `) `
+		}
 		////额外条件（续约合同的起始日期包含在所选时间段内且不包含在新签合同存续期内的客户）
 		//pars1 = append(pars1, endDate)
 
@@ -352,6 +356,11 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		//pars1 = append(pars1, "try_out")
 		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
+		//销售筛选条件
+		if adminId != "" {
+			condition1 += ` AND a.seller_id_init in  (` + adminId + `) `
+		}
+
 		//未续约已确认数量
 		notRenewalCondition := condition1
 		notRenewalPars := pars1
@@ -2191,6 +2200,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 		os.Remove(downLoadnFilePath)
 	}()
 	br.Ret = 200
+	br.IsAddLog = true
 	br.Success = true
 	br.Msg = "导出成功"
 }