fix

controllers/ppt_english_group.go

@@ -506,3 +506,31 @@ func (this *PptEnglishGroupController) GrantPptList() {
 	br.Data = data
 	return
 }
+
+
+// PptList
+// @Title 获取Ppt
+// @Description 获取用户开放的公共Ppt接口
+// @Param   Keyword		query  string	true	"关键字"
+// @Success 200 {object} models.RespGroupPptList
+// @router /ppt/list [get]
+func (this *PptEnglishGroupController) PptList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	keyword := this.GetString("Keyword")
+
+	data, err := ppt.GetEnglishPptList(this.SysUser.AdminId, keyword)
+	if err != nil {
+		br.Msg = err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "查询成功"
+	br.Data = data
+	return
+}

controllers/ppt_v2_group.go

@@ -509,7 +509,7 @@ func (this *PptV2GroupController) GrantPptList() {
 	return
 }
 
-// SharePptList
+// PptList
 // @Title 获取Ppt
 // @Description 获取用户开放的公共Ppt接口
 // @Param   Keyword		query  string	true	"关键字"

services/ppt/ppt_english_group.go

@@ -1365,3 +1365,61 @@ func GetEnglishCopyUsableTitle(title string) (newTitle string, err error) {
 	}
 	return
 }
+
+
+
+// GetEnglishPptList 公共ppt和我的ppt
+// @Author xi
+// @Time 2022-08-29 16:27:59
+func GetEnglishPptList(adminId int, keyword string) (ret ppt_english.RespGroupPptList, err error) {
+	list := make([]*ppt_english.RespGroupPptListItem, 0)
+	ret.List = list
+
+	var condition string
+	var pars []interface{}
+
+	condition += ` AND (admin_id=? OR is_share=1) `
+	pars = append(pars, adminId)
+
+	if keyword != `` {
+		condition += ` AND (title LIKE ? ) `
+		pars = append(pars, "%"+keyword+"%")
+	}
+	pptList, err := ppt_english.GetAllPptEnglishList(condition, pars)
+
+	if len(pptList) <= 0 {
+		return
+	}
+
+	for _, v := range pptList {
+		tmpV := &ppt_english.RespGroupPptListItem{
+			GroupPptId:    int64(v.PptId),
+			PptId:         int64(v.PptId),
+			TemplateType:  v.TemplateType,
+			BackgroundImg: v.BackgroundImg,
+			Title:         v.Title,
+			PptCreateTime: v.CreateTime.Format(utils.FormatDateTime),
+			AdminId:       v.AdminId,
+			AdminRealName: v.AdminRealName,
+			IsSingleShare: v.IsShare,
+			PptxUrl:       v.PptxUrl,
+			ReportId:      v.ReportId,
+			ReportCode:    v.ReportCode,
+		}
+		list = append(list, tmpV)
+	}
+	if keyword != `` {
+		for _, v := range list {
+			if strings.Contains(v.Title, keyword) {
+				index := strings.Index(v.Title,keyword)
+				newTitle := v.Title[:index] + "<span class=\"color-light\">"+ keyword +"</span>"+ v.Title[index+len(keyword):]
+				v.Title = newTitle
+			}
+		}
+	}
+
+
+	ret.List = list
+	ret.Total = len(list)
+	return
+}

services/ppt/ppt_group.go

@@ -1688,7 +1688,7 @@ func GetGrantPptList(adminId int, keyword, sourceType string) (ret models.RespGr
 }
 
 // GetPptList 公共ppt和我的ppt
-// @Author roc
+// @Author xi
 // @Time 2022-08-29 16:27:59
 func GetPptList(adminId int, keyword string) (ret models.RespGroupPptList, err error) {
 	list := make([]*models.RespGroupPptListItem, 0)