Merge branch 'bugfix_6687' into debug

controllers/data_manage/correlation/correlation_chart_info.go

@@ -525,12 +525,12 @@ func (this *CorrelationChartInfoController) List() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/cross_variety/chart_info.go

@@ -99,12 +99,12 @@ func (c *ChartInfoController) List() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/excel/excel_info.go

@@ -375,7 +375,7 @@ func (c *ExcelInfoController) List() {
 
 	pageSize, _ := c.GetInt("PageSize")
 	currentIndex, _ := c.GetInt("CurrentIndex")
-	keyword := c.GetString("Keyword")
+	keyword := c.GetString("KeyWord")
 	adminId, _ := c.GetInt("AdminId")
 	source, _ := c.GetInt("Source")
 
@@ -440,22 +440,18 @@ func (c *ExcelInfoController) List() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` excel_name LIKE '%` + keywordStr + `%' OR `
+		condition += ` excel_name LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` excel_name LIKE '%` + v + `%' OR `
+				condition += ` excel_name LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")
 		condition += " ) "
 	}
 
-	if keyword != "" {
-		condition += ` AND  ( excel_name LIKE ? )`
-		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
-	}
 	if adminId > 0 {
 		condition += " AND sys_user_id = ? "
 		pars = append(pars, adminId)

controllers/data_manage/future_good/future_good_chart_info.go

@@ -97,12 +97,12 @@ func (this *FutureGoodChartInfoController) ChartList() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/line_equation/line_chart_info.go

@@ -603,12 +603,12 @@ func (this *LineEquationChartInfoController) List() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/line_feature/chart_info.go

@@ -1647,12 +1647,12 @@ func (this *LineFeaturesChartInfoController) List() {
 		keywordStr := strings.Replace(keyword, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/my_chart.go

@@ -103,12 +103,12 @@ func (this *MyChartController) ChartList() {
 		keywordStr := strings.Replace(keyWord, " ", "", -1)
 
 		condition += " AND ( "
-		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR `
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
 
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR `
+				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")