|
@@ -302,8 +302,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
|
}
|
|
|
case 3, 4: //ETA指标库、ETA预测指标
|
|
|
if keyword != `` {
|
|
|
- condition += " AND (edb_code like ? OR edb_name like ? OR sys_user_real_name like ? ) "
|
|
|
- pars = utils.GetLikeKeywordPars(pars, keyword, 3)
|
|
|
+ condition += " AND (edb_code like ? OR edb_name like ? OR edb_name_en like ? OR sys_user_real_name like ? ) "
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyword, 4)
|
|
|
}
|
|
|
if userId > 0 {
|
|
|
condition += ` AND sys_user_id = ? `
|
|
@@ -349,8 +349,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
|
|
|
|
// 关键字搜索
|
|
|
if keyword != `` {
|
|
|
- condition += " AND (chart_name like ? OR sys_user_real_name like ? ) "
|
|
|
- pars = utils.GetLikeKeywordPars(pars, keyword, 2)
|
|
|
+ condition += " AND (chart_name like ? or chart_name_en like ? OR sys_user_real_name like ? ) "
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyword, 3)
|
|
|
}
|
|
|
if userId > 0 {
|
|
|
condition += ` AND sys_user_id = ? `
|