fix: PPT自动保存

controllers/ppt_report.go

@@ -163,6 +163,8 @@ func (this *PptV2Controller) ReportList() {
 		currentIndex = 1
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
+	resp := new(models.PptPageReportResp)
+	resp.List = make([]*models.PptReportItem, 0)
 
 	// 获取PPT, source：1-我的；2-协作；3-公共
 	pptList := make([]*models.PptV2, 0)
@@ -181,8 +183,32 @@ func (this *PptV2Controller) ReportList() {
 			pars = append(pars, utils.ReportSourceOuter)
 		}
 		if classifyId > 0 {
-			cond += ` AND classify_id = ?`
-			pars = append(pars, classifyId)
+			// 查询分类及子集
+			classifyOb := new(models.Classify)
+			childCond := ` AND FIND_IN_SET(?, level_path)`
+			childPars := make([]interface{}, 0)
+			childPars = append(childPars, classifyId)
+			children, e := classifyOb.GetItemsByCondition(childCond, childPars, []string{"id"}, "")
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = fmt.Sprintf("获取分类及子分类失败, %v", e)
+				return
+			}
+			var childIds []int
+			for _, v := range children {
+				childIds = append(childIds, v.Id)
+			}
+			if len(childIds) == 0 {
+				page := paging.GetPaging(currentIndex, pageSize, 0)
+				resp.Paging = page
+				br.Data = resp
+				br.Ret = 200
+				br.Success = true
+				br.Msg = "获取成功"
+				return
+			}
+			cond += ` AND classify_id IN (?)`
+			pars = append(pars, childIds)
 		}
 		keyword = strings.TrimSpace(keyword)
 		if keyword != "" {
@@ -206,8 +232,6 @@ func (this *PptV2Controller) ReportList() {
 	}
 	pptList = list
 
-	resp := new(models.PptPageReportResp)
-	resp.List = make([]*models.PptReportItem, 0)
 	for _, v := range pptList {
 		// 当前编辑人
 		t := v.Format2ReportItem(v)

controllers/ppt_v2.go

@@ -133,17 +133,17 @@ func (this *PptV2Controller) AddPpt() {
 			br.Msg = "请输入目录ID"
 			return
 		}
-		item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取数据异常！"
-			br.ErrMsg = "获取数据异常，Err:" + err.Error()
-			return
-		}
-		if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
-			br.Msg = "标题已存在，不可重复添加"
-			br.IsSendEmail = false
-			return
-		}
+		//item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
+		//if err != nil && !utils.IsErrNoRow(err) {
+		//	br.Msg = "获取数据异常！"
+		//	br.ErrMsg = "获取数据异常，Err:" + err.Error()
+		//	return
+		//}
+		//if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
+		//	br.Msg = "标题已存在，不可重复添加"
+		//	br.IsSendEmail = false
+		//	return
+		//}
 		pptInfo := &models.PptV2{
 			//PptId:         0,
 			TemplateType:  req.FirstPage.TemplateType,
@@ -227,17 +227,17 @@ func (this *PptV2Controller) EditPpt() {
 		br.Msg = "标题不能为空"
 		return
 	}
-	item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取数据异常！"
-		br.ErrMsg = "获取数据异常，Err:" + err.Error()
-		return
-	}
-	if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
-		br.Msg = "标题已存在，不可重复添加"
-		br.IsSendEmail = false
-		return
-	}
+	//item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
+	//if err != nil && !utils.IsErrNoRow(err) {
+	//	br.Msg = "获取数据异常！"
+	//	br.ErrMsg = "获取数据异常，Err:" + err.Error()
+	//	return
+	//}
+	//if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
+	//	br.Msg = "标题已存在，不可重复添加"
+	//	br.IsSendEmail = false
+	//	return
+	//}
 	pptInfo, err := models.GetPptV2ById(int(req.PptId))
 	if err != nil {
 		br.Msg = "信息获取失败"
@@ -757,17 +757,17 @@ func (this *PptV2Controller) SaveLog() {
 	}
 
 	// 获取ppt
-	item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && !utils.IsErrNoRow(err) {
-		br.Msg = "获取数据异常！"
-		br.ErrMsg = "获取数据异常，Err:" + err.Error()
-		return
-	}
-	if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
-		br.Msg = "标题已存在，不可重复添加"
-		br.IsSendEmail = false
-		return
-	}
+	//item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
+	//if err != nil && !utils.IsErrNoRow(err) {
+	//	br.Msg = "获取数据异常！"
+	//	br.ErrMsg = "获取数据异常，Err:" + err.Error()
+	//	return
+	//}
+	//if item != nil && item.PptId > 0 && item.PptId != int(req.PptId) {
+	//	br.Msg = "标题已存在，不可重复添加"
+	//	br.IsSendEmail = false
+	//	return
+	//}
 
 	//变更ppt内容
 	pptItem, e := models.GetPptV2ById(int(req.PptId))