fix:知识资源增加排序

controllers/knowledge/resource.go

@@ -76,6 +76,16 @@ func (this *ResourceController) List() {
 	IsShowMe, _ := this.GetBool("IsShowMe")
 
 	isShowPublic, _ := this.GetBool("IsShowPublic")
+	publishSort := this.GetString("PublishSort")
+
+	var sortCond string
+
+	switch publishSort {
+	case "desc":
+		sortCond = ` ORDER BY start_time DESC `
+	case "asc":
+		sortCond = ` ORDER BY start_time ASC `
+	}
 
 	var startSize int
 	if pageSize <= 0 {
@@ -182,7 +192,7 @@ func (this *ResourceController) List() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	listTmp, err := knowledge.GetKnowledgeResourcePageList(condition, pars, startSize, pageSize)
+	listTmp, err := knowledge.GetKnowledgeResourcePageList(condition, pars, sortCond, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

controllers/ppt_v2.go

@@ -847,6 +847,7 @@ func (this *PptV2Controller) SaveLog() {
 		}
 	}
 	pptItem.Abstract = req.Abstract
+	pptItem.CollaborateUsers = req.CollaborateUsers
 	pptItem.TemplateType = req.FirstPage.TemplateType
 	pptItem.BackgroundImg = req.FirstPage.ImgUrl
 	pptItem.CurrentBackgroundImg = req.FirstPage.CurrentBackgroundImg
@@ -861,7 +862,7 @@ func (this *PptV2Controller) SaveLog() {
 	pptItem.ModifyTime = time.Now()
 	pptItem.TitleSetting = req.TitleSetting
 	pptItem.PptPage = len(pptContent)
-	err = pptItem.Update([]string{"Abstract", "TemplateType", "BackgroundImg", "CurrentBackgroundImg", "BackCoverImg", "CurrentBackgroundImgId", "BackCoverImgId", "BackgroundImgId", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "TitleSetting", "ppt_page"})
+	err = pptItem.Update([]string{"CollaborateUsers", "Abstract", "TemplateType", "BackgroundImg", "CurrentBackgroundImg", "BackCoverImg", "CurrentBackgroundImgId", "BackCoverImgId", "BackgroundImgId", "Title", "ReportType", "PptDate", "Content", "ModifyTime", "TitleSetting", "ppt_page"})
 	if err != nil {
 		br.Msg = "自动保存失败"
 		br.ErrMsg = fmt.Sprintf("自动保存PPT失败, ID: %d, Err: %v", pptItem.PptId, err)

models/knowledge/knowledge_resource.go

@@ -130,12 +130,17 @@ func GetBatchKnowledgeResourceByCondition(condition string, pars []interface{},
 	return
 }
 
-func GetKnowledgeResourcePageList(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeResource, err error) {
+func GetKnowledgeResourcePageList(condition string, pars []interface{}, sortCond string, startSize, pageSize int) (items []*KnowledgeResource, err error) {
 	sql := `SELECT * FROM knowledge_resource WHERE 1=1  AND is_delete=0 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += `ORDER BY modify_time DESC LIMIT ?,?`
+	if sortCond != "" {
+		sql += sortCond
+	} else {
+		sql += `ORDER BY modify_time DESC `
+	}
+	sql += ` LIMIT ?,?`
 	pars = append(pars, startSize)
 	pars = append(pars, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error