no message

controllers/statistic_company_merge.go

@@ -403,9 +403,9 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 		}
 
-		if isConfirm == 1 {
-			condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
-		}
+		//if isConfirm == 1 {
+		//	condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
+		//}
 		condition1 += conditionAscribRai
 		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "未续约客户" {
@@ -2191,6 +2191,9 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 		}
 
 		for _, item := range listRaiSeller {
+			if item.Enabled == 0 && mapNoRenewalContractTotal[item.AdminId] == 0 && mapExpireRenewalContractTotal[item.AdminId] == 0 {
+				continue
+			}
 			row := sheet.AddRow()
 			cellAData := row.AddCell()
 			cellAData.Value = item.RealName

models/system/sys_admin.go

@@ -481,7 +481,7 @@ func GetSysuserRaiList() (items []*AdminItem, err error) {
 // GetSysuserRaiList 获取除服务组之外的所有权益销售
 func GetSysuserRaiListNoServer() (items []*AdminItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT  * FROM admin WHERE role_type_code  IN ('rai_group','rai_seller')  AND enabled = 1  AND role_name NOT IN ('权益服务销售','权益服务组长')  `
+	sql := `SELECT  * FROM admin WHERE role_type_code  IN ('rai_group','rai_seller')   AND role_name NOT IN ('权益服务销售','权益服务组长')  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }