|
@@ -1755,7 +1755,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
|
|
}
|
|
}
|
|
|
|
|
|
resp.ClassifyLevels = classifyLevels
|
|
resp.ClassifyLevels = classifyLevels
|
|
-
|
|
|
|
|
|
+
|
|
//图表操作权限
|
|
//图表操作权限
|
|
chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, chartInfo.HaveOperaAuth)
|
|
chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, chartInfo.HaveOperaAuth)
|
|
chartInfo.Button = data_manage.ChartViewButton{
|
|
chartInfo.Button = data_manage.ChartViewButton{
|
|
@@ -4656,7 +4656,12 @@ func (this *ChartInfoController) ChartList() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if keyWord != "" {
|
|
if keyWord != "" {
|
|
- condition += ` AND ( chart_name LIKE '%` + keyWord + `%' OR chart_name_en LIKE '%` + keyWord + `%' )`
|
|
|
|
|
|
+ keyWordArr := strings.Split(keyWord, " ")
|
|
|
|
+ if len(keyWordArr) > 0 {
|
|
|
|
+ for _, v := range keyWordArr {
|
|
|
|
+ condition += ` AND CONCAT(chart_name,chart_name_en) LIKE '%` + v + `%'`
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if sysUserIds != "" {
|
|
if sysUserIds != "" {
|
|
adminIds := strings.Split(sysUserIds, ",")
|
|
adminIds := strings.Split(sysUserIds, ",")
|
|
@@ -5012,4 +5017,4 @@ func (this *ChartInfoController) ModifyChartList() {
|
|
br.Ret = 200
|
|
br.Ret = 200
|
|
br.Success = true
|
|
br.Success = true
|
|
br.Msg = "操作成功"
|
|
br.Msg = "操作成功"
|
|
-}
|
|
|
|
|
|
+}
|