Merge branch 'dev/1.2' into debug

services/data/chart_info_elastic.go

@@ -197,12 +197,12 @@ func EsDeleteMyChartInfoByChartInfoId(chartInfoId int) {
 
 	var condition string
 	var pars []interface{}
-	condition += " a.chart_info_id = ? "
+	condition += ` AND a.chart_info_id = ? `
 	pars = append(pars, chartInfoId)
 
 	allList, err := data_manage.GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition, pars)
 	if err != nil {
-		errMsg = append(errMsg, fmt.Sprintf("AddAllMyChartInfo Err:%s", err.Error()))
+		errMsg = append(errMsg, fmt.Sprintf("GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition Err:%s", err.Error()))
 		return
 	}
 	for _, v := range allList {