Merge remote-tracking branch 'origin/eta/1.7.6' into debug

controllers/data_manage/cross_variety/chart_info.go

@@ -1365,6 +1365,9 @@ func (c *ChartInfoController) SearchByEs() {
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
 	keyword := c.GetString("Keyword")
+	if keyword == `` { // 兼容jp前端
+		keyword = c.GetString("KeyWord")
+	}
 
 	//只看我的
 	isShowMe, _ := c.GetBool("IsShowMe")