Merge branch 'feature/gn_2.1'

controllers/ppt_report.go

@@ -52,8 +52,8 @@ func (this *PptV2Controller) ReportClassify() {
 			cond += ` AND collaborate_type = ? AND (admin_id = ? OR FIND_IN_SET(?, collaborate_users)) `
 			pars = append(pars, utils.ReportWriteTypeGroup, sysUser.AdminId)
 		case 3:
-			cond += ` AND report_source = ?`
-			pars = append(pars, utils.ReportSourceOuter)
+			cond += ` AND report_source = ? AND state = ?`
+			pars = append(pars, utils.ReportSourceOuter, models.ReportStatePass)
 		}
 		pptOb := new(models.PptV2)
 		list, e := pptOb.GetItemsByCondition(cond, pars, models.PptReportQueryFields, "modify_time DESC")
@@ -213,8 +213,8 @@ func (this *PptV2Controller) ReportList() {
 			cond += ` AND collaborate_type = ? AND (admin_id = ? OR FIND_IN_SET(?, collaborate_users)) `
 			pars = append(pars, utils.ReportWriteTypeGroup, sysUser.AdminId, sysUser.AdminId)
 		case 3:
-			cond += ` AND report_source = ?`
-			pars = append(pars, utils.ReportSourceOuter)
+			cond += ` AND report_source = ? AND state = ?`
+			pars = append(pars, utils.ReportSourceOuter, models.ReportStatePass)
 		}
 		if classifyId > 0 {
 			// 查询分类及子集
@@ -406,6 +406,13 @@ func (this *PptV2Controller) CreateReport() {
 		newItem.TitleSetting = req.TitleSetting
 	}
 
+	// 初始的PPT页数
+	if newItem.Content != "" {
+		var pageContents []services.PPTContent
+		_ = json.Unmarshal([]byte(newItem.Content), &pageContents) // 这里转不过去问题也不大，编辑时自动保存会更新页数字段
+		newItem.PptPage = len(pageContents)
+	}
+
 	newId, e := models.AddPptV2(newItem)
 	if e != nil {
 		br.Msg = "操作失败"
@@ -467,18 +474,18 @@ func (this *PptV2Controller) AuthList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
 	var pptList []*models.PptReportItem
-	// 无相关搜索，返回空集
-	//if keyword == `` && classifyId <= 0 {
-	//	page := paging.GetPaging(currentIndex, pageSize, 0)
-	//	resp := new(models.PptPageReportResp)
-	//	resp.Paging = page
-	//	resp.List = pptList
-	//	br.Ret = 200
-	//	br.Success = true
-	//	br.Msg = "获取成功"
-	//	br.Data = resp
-	//	return
-	//}
+	// 无相关搜索时，返回空集(其实我感觉没必要，没关键词查全部也属于正常=_=!)
+	if keyword == `` && classifyId <= 0 {
+		page := paging.GetPaging(currentIndex, pageSize, 0)
+		resp := new(models.PptPageReportResp)
+		resp.Paging = page
+		resp.List = pptList
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 
 	// 查询自己创建的以及协作人包含自己的报告
 	var cond string

controllers/report_v2.go

@@ -1763,7 +1763,7 @@ func (this *ReportController) MessageList() {
 		ob := new(models.PptV2)
 		cond := ` AND ppt_id IN (?)`
 		pars := make([]interface{}, 0)
-		pars = append(pars, reportIds)
+		pars = append(pars, pptIds)
 		items, e := ob.GetItemsByCondition(cond, pars, []string{"ppt_id", "state"}, "")
 		if e != nil {
 			br.Msg = "获取失败"