Merge branch 'bug/7838'

# Conflicts:
#	models/ppt_v2_group_mapping.go

models/ppt_v2_group_mapping.go

@@ -50,7 +50,7 @@ func GetPptMappingCountByGroupId(groupId int64) (total int64, err error) {
 // GetPptMappingListByGroupId 查询目录下，ppt列表
 func GetPptMappingListByGroupId(groupId int64) (list []*PptV2GroupMapping, err error) {
 	o := global.DbMap[utils.DbNameReport]
-	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_v2_group_mapping where group_id=? order by ppt_sort asc, group_ppt_id asc `
+	sql := `select group_ppt_id, group_id, ppt_id, ppt_sort, admin_id, admin_real_name, create_time from ppt_v2_group_mapping where group_id=? order by ppt_sort asc, group_ppt_id desc `
 	err = o.Raw(sql, groupId).Find(&list).Error
 	return
 }

services/ppt/ppt_group.go

@@ -230,6 +230,7 @@ func AddGroupPptMapping(pptId int64, groupId int64, adminId int, adminRealName s
 		PptId:         pptId,
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
+		PptSort:       0,
 	}
 
 	newId, err = models.AddPptGroupMapping(bindInfo)
@@ -239,12 +240,12 @@ func AddGroupPptMapping(pptId int64, groupId int64, adminId int, adminRealName s
 	}
 
 	bindInfo.GroupPptId = newId
-	bindInfo.PptSort = newId
-	err = bindInfo.Update([]string{"ppt_sort"})
-	if err != nil {
-		err = errors.New("更新排序失败:" + err.Error())
-		return
-	}
+	//bindInfo.PptSort = newId
+	//err = bindInfo.Update([]string{"ppt_sort"})
+	//if err != nil {
+	//	err = errors.New("更新排序失败:" + err.Error())
+	//	return
+	//}
 	return
 }
 
@@ -405,6 +406,7 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 				ModifyTime:    time.Now(),
 				AdminId:       adminId,
 				AdminRealName: adminRealName,
+				PptSort:       0,
 			}
 			newMappings = append(newMappings, tmp)
 		}
@@ -414,15 +416,15 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 			return
 		}
 		//批量更新排序字段
-		var newGroupPptIds []int64
-		for _, v := range newMappings {
-			newGroupPptIds = append(newGroupPptIds, v.GroupPptId)
-		}
-		err = models.UpdatePptGroupMappingSortMulti(newGroupPptIds)
-		if err != nil {
-			err = errors.New("更新排序标识出错:" + err.Error())
-			return
-		}
+		//var newGroupPptIds []int64
+		//for _, v := range newMappings {
+		//	newGroupPptIds = append(newGroupPptIds, v.GroupPptId)
+		//}
+		//err = models.UpdatePptGroupMappingSortMulti(newGroupPptIds)
+		//if err != nil {
+		//	err = errors.New("更新排序标识出错:" + err.Error())
+		//	return
+		//}
 	}
 	return
 }
@@ -964,6 +966,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		ModifyTime:    time.Now(),
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
+		PptSort:       0,
 	}
 	newMappings = append(newMappings, newGroupPpt)
 
@@ -973,11 +976,11 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		return
 	}
 	//批量更新排序字段
-	err = models.UpdatePptGroupMappingSortMulti([]int64{newGroupPpt.GroupPptId})
-	if err != nil {
-		err = errors.New("更新排序标识出错:" + err.Error())
-		return
-	}
+	//err = models.UpdatePptGroupMappingSortMulti([]int64{newGroupPpt.GroupPptId})
+	//if err != nil {
+	//	err = errors.New("更新排序标识出错:" + err.Error())
+	//	return
+	//}
 	pptPage := 0
 	// 因之前并没有存储PPT页数字段，所以此处读取PPT内容的长度
 	if newPpt.Content != "" {
@@ -1144,6 +1147,7 @@ func InitPptGroup() (err error) {
 					ModifyTime:    now,
 					AdminId:       p.AdminId,
 					AdminRealName: p.AdminRealName,
+					PptSort:       0,
 				}
 				newMappings = append(newMappings, tmp)
 			}
@@ -1160,16 +1164,17 @@ func InitPptGroup() (err error) {
 					ModifyTime:    now,
 					AdminId:       p.AdminId,
 					AdminRealName: p.AdminRealName,
+					PptSort:       0,
 				}
 				newMappings = append(newMappings, tmp)
 			}
 		}
 	}
-	err = models.UpdatePptGroupSortMulti(newGroupIds)
-	if err != nil {
-		err = errors.New("更新目录排序标识出错:" + err.Error())
-		return
-	}
+	//err = models.UpdatePptGroupSortMulti(newGroupIds)
+	//if err != nil {
+	//	err = errors.New("更新目录排序标识出错:" + err.Error())
+	//	return
+	//}
 
 	err = models.AddPptGroupMappingMulti(newMappings)
 	if err != nil {