Merge branch 'bugfix_6687' into debug

controllers/data_manage/correlation/correlation_chart_info.go

@@ -530,7 +530,9 @@ func (this *CorrelationChartInfoController) List() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				if v != "" {
+					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

@@ -104,8 +104,9 @@ func (c *ChartInfoController) List() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
-			}
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}			}
 		}
 		condition = strings.TrimRight(condition, "OR")
 		condition += " ) "

controllers/data_manage/excel/excel_info.go

@@ -445,7 +445,9 @@ func (c *ExcelInfoController) List() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` excel_name LIKE '%` + v + `%' OR`
+				if v != "" {
+					condition += ` excel_name LIKE '%` + v + `%' OR`
+				}
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/future_good/future_good_chart_info.go

@@ -102,8 +102,9 @@ func (this *FutureGoodChartInfoController) ChartList() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
-			}
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}			}
 		}
 		condition = strings.TrimRight(condition, "OR")
 		condition += " ) "

controllers/data_manage/line_equation/line_chart_info.go

@@ -608,7 +608,9 @@ func (this *LineEquationChartInfoController) List() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")

controllers/data_manage/my_chart.go

@@ -108,7 +108,9 @@ func (this *MyChartController) ChartList() {
 		keyWordArr = append(keyWordArr, newKeyWord...)
 		if len(keyWordArr) > 0 {
 			for _, v := range keyWordArr {
-				condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}
 			}
 		}
 		condition = strings.TrimRight(condition, "OR")