no message

controllers/statistic_company_merge.go

@@ -867,9 +867,9 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 	//	return
 	//}
 
-	if permissionName == "" {
-		condition += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
-	}
+	//if permissionName == "" {
+	condition += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
+	//}
 
 	var err error
 	//新签客户数
@@ -1000,11 +1000,10 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 			br.ErrMsg = "获取失败，Err:" + err.Error()
 			return
 		}
-
+		notRenewalCompanyTotal = total
 		condition1 += conditionAscribRai
 		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "行业未续约" {
-			notRenewalCompanyTotal = total
 			conditionPerssion := condition1
 			parsPerssion := pars1
 			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`