Merge branch 'bug/7838' into debug

services/ppt/ppt_group.go

@@ -410,6 +410,7 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 				ModifyTime:    time.Now(),
 				AdminId:       adminId,
 				AdminRealName: adminRealName,
+				PptSort:       0,
 			}
 			newMappings = append(newMappings, tmp)
 		}
@@ -419,15 +420,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
 }
@@ -969,6 +970,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)
 
@@ -978,11 +980,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 != "" {
@@ -1149,6 +1151,7 @@ func InitPptGroup() (err error) {
 					ModifyTime:    now,
 					AdminId:       p.AdminId,
 					AdminRealName: p.AdminRealName,
+					PptSort:       0,
 				}
 				newMappings = append(newMappings, tmp)
 			}
@@ -1165,16 +1168,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 {