Merge branch 'bugfix_7333' into debug

models/calculate_residual_analysis_config.go

@@ -41,7 +41,7 @@ func GetResidualAnalysisConfigById(edbInfoId int) (residualAnalysisConfig Calcul
 	o := orm.NewOrm()
 	sql := `SELECT t2.* FROM calculate_residual_analysis_config_mapping t1 
 			join calculate_residual_analysis_config t2 on t1.calculate_residual_analysis_config_id = t2.calculate_residual_analysis_config_id
-			WHERE t1.edb_info_id = ?`
+			WHERE t1.edb_info_id = ? and index_type!=3 and index_type !=4`
 	err = o.Raw(sql, edbInfoId).QueryRow(&residualAnalysisConfig)
 	return
 }