Browse Source

无权限不返回任何信息

xyxie 3 months ago
parent
commit
429dd59ca1
2 changed files with 38 additions and 4 deletions
  1. 28 3
      controllers/chart_collect.go
  2. 10 1
      controllers/chart_info.go

+ 28 - 3
controllers/chart_collect.go

@@ -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

+ 10 - 1
controllers/chart_info.go

@@ -281,6 +281,15 @@ func (this *ChartInfoController) UserChartList() {
 		br.ErrMsg = "获取用户权限失败,Err:" + err.Error()
 		return
 	}
+	if len(permissionClassifyIds) == 0 {
+		resp.ChartInfoList = allChartInfo
+		resp.Paging = page
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 
 	condition := ""
 	pars := make([]interface{}, 0)
@@ -346,7 +355,7 @@ func (this *ChartInfoController) CommonChartInfoDetailFromUniqueCode() {
 	isCache, _ := this.GetBool("IsCache")
 	key := utils.CACHE_CHART_INFO_DATA + uniqueCode
 	resp := new(models.ChartInfoDetailResp)
-	
+
 	//判断是否有缓存
 	if utils.Re == nil && isCache {
 		if utils.Re == nil && utils.Rc.IsExist(key) {