|
@@ -56,6 +56,23 @@ func (this *ChartCollectController) ClassifyList() {
|
|
|
br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ // 获取有权限的分类ID
|
|
|
+ permissionClassifyIds, err := services.GetPermissionClassifyIdByUserId(sysUser.UserId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取有权限的分类信息失败"
|
|
|
+ br.ErrMsg = "获取有权限的分类信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ lenPermissionClassifyIds := len(permissionClassifyIds)
|
|
|
+ if lenPermissionClassifyIds == 0 {
|
|
|
+ items := make([]*chart_collect.ChartCollectClassifyItem, 0)
|
|
|
+ resp.List = items
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
//获取图表信息
|
|
|
list, err := chart_collect.GetChartCollectClassifyAll(sysUser.UserId)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -197,11 +214,21 @@ func (this *ChartCollectController) ChartList() {
|
|
|
br.ErrMsg = "获取有权限的分类信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ page := paging.GetPaging(currentIndex, pageSize, int(total))
|
|
|
+ resp := new(chart_collect.ChartCollectListResp)
|
|
|
lenPermissionClassifyIds := len(permissionClassifyIds)
|
|
|
if lenPermissionClassifyIds > 0 {
|
|
|
condition += ` AND b.chart_classify_id in (` + utils.GetOrmInReplace(lenPermissionClassifyIds) + `) `
|
|
|
pars = append(pars, permissionClassifyIds)
|
|
|
+ } else {
|
|
|
+ items := make([]*chart_collect.ChartCollectView, 0)
|
|
|
+ resp.Paging = page
|
|
|
+ resp.List = items
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Data = resp
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ return
|
|
|
}
|
|
|
list := make([]*chart_collect.ChartCollectView, 0)
|
|
|
if keyword != "" {
|
|
@@ -254,8 +281,6 @@ func (this *ChartCollectController) ChartList() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- page := paging.GetPaging(currentIndex, pageSize, int(total))
|
|
|
- resp := new(chart_collect.ChartCollectListResp)
|
|
|
if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
|
|
|
items := make([]*chart_collect.ChartCollectView, 0)
|
|
|
resp.Paging = page
|