Merge branch 'bzq1/ppt' of eta_server/eta_api into master

services/ppt/ppt_group.go

@@ -592,7 +592,7 @@ func GetGroupPptList(groupId int64, adminId int) (ret models.RespGroupPptList, e
 	}
 
 	for _, v := range pptList {
-		if v.PptPage == 0 {
+		if v.PptPage == 0 && v.Content != "" {
 			var pptContent []services.PPTContent
 			err = json.Unmarshal([]byte(v.Content), &pptContent)
 			if err != nil {
@@ -1588,7 +1588,7 @@ func GetMyPptList(adminId int, keyword string) (ret models.RespGroupPptList, err
 
 	var pptContent []services.PPTContent
 	for _, v := range pptList {
-		if v.PptPage == 0 {
+		if v.PptPage == 0 && v.Content != "" {
 			err = json.Unmarshal([]byte(v.Content), &pptContent)
 			if err != nil {
 				return