no message

controllers/cygx/user.go

@@ -3005,14 +3005,14 @@ func (this *UserController) CompanyList() {
 		}
 
 		//机构阅读数量太大，先存下来，后面优化
-		//detailConfig, err := cygx.GetCygxConfigDetailByCode("company_article_history_num")
-		//if err != nil {
-		//	br.Msg = "获取失败"
-		//	br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		//	return
-		//}
+		detailConfig, err := cygx.GetCygxConfigDetailByCode("company_article_history_num")
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
 
-		//total, _ = strconv.Atoi(detailConfig.ConfigValue)
+		total, _ = strconv.Atoi(detailConfig.ConfigValue)
 		//total, err = cygx.GetCygxArticleHistoryCountByCompany(condition)
 		//if err != nil {
 		//	br.Msg = "获取信息失败"
@@ -3022,7 +3022,9 @@ func (this *UserController) CompanyList() {
 
 		//fmt.Println("es 搜索")
 		totalEs, esList, err := services.SearcCygxArticleHistoryData(utils.IndexNameArticleHistory, keyWord, startDate, endDate, companyIds, startSize, pageSize)
-		total = int(totalEs)
+		if keyWord+startDate+endDate == "" {
+			total = int(totalEs)
+		}
 		var articleIds string
 		if len(esList) > 0 {
 			articleIdMap := make(map[int]int)
@@ -3676,13 +3678,30 @@ func (this *UserController) CompanyExportInteractionList() {
 		}
 	}
 
+	//condition += ` AND b.status IN ('正式','试用','冻结') `
+	//companyCondition := `SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
+	//if condition != "" {
+	//	companyCondition += condition
+	//}
+
 	condition += ` AND b.status IN ('正式','试用','冻结') `
 	companyCondition := `SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
+	companyIdsCondition := `SELECT GROUP_CONCAT( DISTINCT  a.company_id SEPARATOR ',' )  AS company_ids   FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
 	if condition != "" {
 		companyCondition += condition
 	}
+	companyIdsCondition += condition
+	var companyIds string
+	companyIds, err = cygx.GetCompanyIdsCondition(companyIdsCondition)
+
+	companyIds, err = cygx.GetCompanyIdsCondition(companyIdsCondition)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取公司ID数据失败，Err:" + err.Error()
+		return
+	}
 
-	condition = ` AND r.company_id  IN  (   ` + companyCondition + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
+	condition = ` AND r.company_id  IN  (   ` + companyIds + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 	if keyWord != "" {
 		condition += ` AND  (r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%'` + ` OR r.company_name LIKE '%` + keyWord + `%') `
 	}