Browse Source

默认图片处理

gmy 3 months ago
parent
commit
2f883c37aa
2 changed files with 38 additions and 2 deletions
  1. 2 2
      controllers/image_conf_controller.go
  2. 36 0
      controllers/ppt_v2.go

+ 2 - 2
controllers/image_conf_controller.go

@@ -282,8 +282,8 @@ func (this *ImageConfController) DeleteImageMaterial() {
 			return
 		}
 		if count > 0 {
-			br.Msg = "该素材正在使用中,不允许删除"
-			br.ErrMsg = "该素材正在使用中,不允许删除"
+			br.Msg = "图片已被使用,不允许删除"
+			br.ErrMsg = "图片已被使用,不允许删除"
 			return
 		}
 		imageConfIds = append(imageConfIds, deleteReq.ImageConfId)

+ 36 - 0
controllers/ppt_v2.go

@@ -410,6 +410,42 @@ func (this *PptV2Controller) DetailPpt() {
 		}
 	}
 
+	var condition string
+	var pars []interface{}
+
+	// 维护封底 背景图 前端懒 不愿意再查 让我这边返 这块后期素材多了 可能会调整复杂
+	if pptInfo.CurrentBackgroundImg != "" {
+		condition += ` conf_type=? `
+		pars = append(pars, 1)
+
+		condition += ` AND image_type=? `
+		pars = append(pars, 2)
+
+		condition += ` ORDER BY modify_time DESC `
+
+		imageConfList, err := models.GetImageConfByCondition(condition, pars)
+
+		if err == nil && len(imageConfList) > 0 {
+			pptInfo.CurrentBackgroundImg = imageConfList[0].Url
+			pptInfo.CurrentBackgroundImgId = imageConfList[0].ImageConfId
+		}
+	} else if pptInfo.BackCoverImg != "" {
+		condition += ` conf_type=? `
+		pars = append(pars, 1)
+
+		condition += ` AND image_type=? `
+		pars = append(pars, 3)
+
+		condition += ` ORDER BY modify_time DESC `
+
+		imageConfList, err := models.GetImageConfByCondition(condition, pars)
+
+		if err == nil && len(imageConfList) > 0 {
+			pptInfo.BackCoverImg = imageConfList[0].Url
+			pptInfo.BackCoverImgId = imageConfList[0].ImageConfId
+		}
+	}
+
 	// 编辑中
 	editor, e := services.UpdatePptEditing(pptId, 0, sysUser.AdminId, sysUser.RealName, false)
 	if e != nil {