Merge branch 'bzq/306_report_classify' of eta_gn_server/eta_api into debug

controllers/ppt_report.go

@@ -527,6 +527,17 @@ func (this *PptV2Controller) AuthList() {
 		cond += ` AND title LIKE ? `
 		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
 	}
+	noVisisbleClassifyIds, err := models.GetNoVisibleClassifyIdByAdminId(sysUser.AdminId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = fmt.Sprintf("获取不可见分类失败, %v", err)
+		return
+	}
+	if len(noVisisbleClassifyIds) > 0 {
+		cond += ` AND classify_id NOT IN (?)`
+		pars = append(pars, noVisisbleClassifyIds)
+	}
+
 	pptOb := new(models.PptV2)
 	total, e := pptOb.GetCountByCondition(cond, pars)
 	if e != nil {