Merge branch 'cygx_fix_need_11-30' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -129,37 +129,6 @@ func (this *ReportController) IndustryList() {
 		condition += ` AND is_deep_label = ` + isDeepLabel
 	}
 	if keyWord != "" {
-		//keyWordArr, err := services.GetIndustryMapNameSliceV2(keyWord)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-		//	return
-		//}
-		//var conditionkeyWord string
-		//conditionkeyWord += ` subject_names LIKE '%` + keyWord + `%'`
-		//keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
-		//keyWordLen := len(keyWordArr)
-		//if keyWordLen <= 0 {
-		//	keyWordArr = append(keyWordArr, keyWord)
-		//	keyWordLen = len(keyWordArr)
-		//}
-		//for _, v := range keyWordArr {
-		//	conditionkeyWord += ` OR subject_names LIKE '%` + v + `%'`
-		//}
-		//industrialManagementIds, err := models.GetIndustrialManagementIdsBykeyWord(conditionkeyWord)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-		//	return
-		//}
-		//if industrialManagementIds == "" {
-		//	br.Ret = 200
-		//	br.Success = true
-		//	br.Msg = "获取成功"
-		//	br.Data = resp
-		//	return
-		//}
-		//condition += ` AND man.industrial_management_id IN (` + industrialManagementIds + `)`
 		condition += ` AND  subject_names LIKE '%` + keyWord + `%'`
 	}
 	var sqlChartPermissionId string

models/industrial_management.go

@@ -673,14 +673,13 @@ func GetNewArticleDetailByIndustrialIds(industrialIdArr []int) (items []*Industr
 			cygx_industrial_article_group_management AS mg
 			INNER JOIN cygx_article AS a ON mg.article_id = a.article_id 
 		WHERE
-			1 = 1 
-			AND a.article_id < ?
+			1 = 1
 			AND a.is_report = 1
 			AND a.is_class = 1
 			AND mg.industrial_management_id IN(` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   
 		GROUP BY
 			mg.industrial_management_id `
-	_, err = o.Raw(sql, utils.SummaryArticleId, industrialIdArr).QueryRows(&items)
+	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
 	return
 }
 

utils/config.go

@@ -160,7 +160,7 @@ func init() {
 		WxPublicAppId = "wx4a844c734d8c8e56"
 		WxPublicAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		WxPublicId = "gh_b67e0049fb8c"
-		IndexName = "cygx_article_v0718"
+		IndexName = "cygx_article_v1213"
 		IndexNameArticleHistory = "cygx_article_history_v07_08"
 
 		//接收附件邮箱