Merge branch 'bugfix_6687'

controllers/data_manage/correlation/correlation_chart_info.go

@@ -517,8 +517,25 @@ func (this *CorrelationChartInfoController) List() {
 		}
 		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}
+			}
+		}
+		condition = strings.TrimRight(condition, "OR")
+		condition += " ) "
 	}
 
 	//只看我的

controllers/data_manage/cross_variety/chart_info.go

@@ -91,8 +91,24 @@ func (c *ChartInfoController) List() {
 		}
 		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				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

@@ -373,7 +373,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")
 
@@ -431,10 +431,27 @@ func (c *ExcelInfoController) List() {
 			pars = append(pars, classifyIds)
 		}
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( excel_name LIKE ? )`
-		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` excel_name LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				if v != "" {
+					condition += ` excel_name LIKE '%` + v + `%' OR`
+				}
+			}
+		}
+		condition = strings.TrimRight(condition, "OR")
+		condition += " ) "
 	}
+
 	if adminId > 0 {
 		condition += " AND sys_user_id = ? "
 		pars = append(pars, adminId)

controllers/data_manage/future_good/future_good_chart_info.go

@@ -90,8 +90,24 @@ func (this *FutureGoodChartInfoController) ChartList() {
 		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 		//pars = append(pars, chartClassifyId)
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				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

@@ -595,8 +595,25 @@ func (this *LineEquationChartInfoController) List() {
 		}
 		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}
+			}
+		}
+		condition = strings.TrimRight(condition, "OR")
+		condition += " ) "
 	}
 
 	//只看我的

controllers/data_manage/line_feature/chart_info.go

@@ -1640,8 +1640,23 @@ func (this *LineFeaturesChartInfoController) List() {
 		}
 		condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 	}
+
+	var keyWordArr []string
 	if keyword != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyword + `%' )`
+		newKeyWord := strings.Split(keyword, " ")
+		keywordStr := strings.Replace(keyword, " ", "", -1)
+
+		condition += " AND ( "
+		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 = strings.TrimRight(condition, "OR")
+		condition += " ) "
 	}
 
 	//只看我的

controllers/data_manage/my_chart.go

@@ -96,8 +96,25 @@ func (this *MyChartController) ChartList() {
 		condition += " AND chart_classify_id IN(" + utils.GetOrmInReplace(len(chartClassifyIds)) + ") "
 		pars = append(pars, chartClassifyIds)
 	}
+
+	var keyWordArr []string
 	if keyWord != "" {
-		condition += ` AND  ( chart_name LIKE '%` + keyWord + `%' OR chart_name_en LIKE '%` + keyWord + `%' )`
+		newKeyWord := strings.Split(keyWord, " ")
+		keywordStr := strings.Replace(keyWord, " ", "", -1)
+
+		condition += " AND ( "
+		condition += ` chart_name LIKE '%` + keywordStr + `%' OR chart_name_en LIKE '%` + keywordStr + `%' OR`
+
+		keyWordArr = append(keyWordArr, newKeyWord...)
+		if len(keyWordArr) > 0 {
+			for _, v := range keyWordArr {
+				if v != "" {
+					condition += ` chart_name LIKE '%` + v + `%' OR chart_name_en LIKE '%` + v + `%' OR`
+				}
+			}
+		}
+		condition = strings.TrimRight(condition, "OR")
+		condition += " ) "
 	}
 
 	//只看我的