fix

controllers/ppt_v2_group.go

@@ -508,3 +508,30 @@ func (this *PptV2GroupController) GrantPptList() {
 	br.Data = data
 	return
 }
+
+// SharePptList
+// @Title 获取Ppt
+// @Description 获取用户开放的公共Ppt接口
+// @Param   Keyword		query  string	true	"关键字"
+// @Success 200 {object} models.RespGroupPptList
+// @router /ppt/list [get]
+func (this *PptV2GroupController) PptList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	keyword := this.GetString("Keyword")
+
+	data, err := ppt.GetPptList(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/sys_user.go

@@ -103,7 +103,7 @@ func (this *SysUserController) Login() {
 	resp.RealName = sysUser.RealName
 	resp.AdminName = sysUser.AdminName
 	resp.RoleName = sysUser.RoleName
-
+	resp.DepartmentName = sysUser.DepartmentName
 	resp.SysRoleTypeCode = sysUser.RoleTypeCode //系统角色编码
 	resp.RoleTypeCode = sysUser.RoleTypeCode
 

models/system/sys_user.go

@@ -21,6 +21,7 @@ type LoginResp struct {
 	SysRoleTypeCode string `description:"角色类型编码"`
 	AdminId         int    `description:"系统用户id"`
 	ProductName     string `description:"产品名称：admin,ficc,权益"`
+	DepartmentName  string `description:"部门名称"`
 	Authority       int    `description:"管理权限，0：无，1：部门负责人，2：小组负责人,或者ficc销售主管，4:ficc销售组长"`
 }
 
@@ -199,4 +200,4 @@ func GetAdminListByIdListWithoutEnable(idList []int) (items []*Admin, err error)
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, idList).QueryRows(&items)
 	return
-}
+}

routers/commentsRouter.go

@@ -592,6 +592,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_ETA_mobile_api/controllers:PptV2GroupController"] = append(beego.GlobalControllerRouter["hongze/hongze_ETA_mobile_api/controllers:PptV2GroupController"],
+        beego.ControllerComments{
+            Method: "PptList",
+            Router: `/ppt/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_ETA_mobile_api/controllers:PptV2GroupController"] = append(beego.GlobalControllerRouter["hongze/hongze_ETA_mobile_api/controllers:PptV2GroupController"],
         beego.ControllerComments{
             Method: "SharePpt",

services/ppt/ppt_group.go

@@ -1686,3 +1686,60 @@ func GetGrantPptList(adminId int, keyword, sourceType string) (ret models.RespGr
 	ret.Total = len(list)
 	return
 }
+
+// GetPptList 公共ppt和我的ppt
+// @Author roc
+// @Time 2022-08-29 16:27:59
+func GetPptList(adminId int, keyword string) (ret models.RespGroupPptList, err error) {
+	list := make([]*models.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 := models.GetAllPptV2List(condition, pars)
+
+	if len(pptList) <= 0 {
+		return
+	}
+
+	for _, v := range pptList {
+		tmpV := &models.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,
+			PptVersion:    v.PptVersion,
+			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
+}