|
@@ -14,7 +14,6 @@ import (
|
|
|
"hongze/hongze_yb/utils"
|
|
|
"io/ioutil"
|
|
|
"strconv"
|
|
|
- "strings"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -103,16 +102,15 @@ func GetMyChartList(c *gin.Context) {
|
|
|
condition += " AND b.chart_name LIKE ?"
|
|
|
pars = append(pars, "%" + reqKeywords + "%")
|
|
|
// 搜索自己权限内的图表
|
|
|
- classifyIdSlice := make([]string, 0)
|
|
|
+ classifyIds := make([]int, 0)
|
|
|
for i := 0; i < len(publicClassify); i++ {
|
|
|
- classifyIdSlice = append(classifyIdSlice, strconv.Itoa(publicClassify[i].MyChartClassifyId))
|
|
|
+ classifyIds = append(classifyIds, publicClassify[i].MyChartClassifyId)
|
|
|
}
|
|
|
for i := 0; i < len(privateClassify); i++ {
|
|
|
- classifyIdSlice = append(classifyIdSlice, strconv.Itoa(privateClassify[i].MyChartClassifyId))
|
|
|
+ classifyIds = append(classifyIds, privateClassify[i].MyChartClassifyId)
|
|
|
}
|
|
|
- classifyIdsStr := strings.Join(classifyIdSlice, ",")
|
|
|
condition += " AND d.my_chart_classify_id IN (?)"
|
|
|
- pars = append(pars, classifyIdsStr)
|
|
|
+ pars = append(pars, classifyIds)
|
|
|
} else {
|
|
|
// 指定分类
|
|
|
condition += " AND d.my_chart_classify_id = ?"
|