Merge branch 'feature/eta1.1.0_edb_classify' into debug

services/data/edb_classify.go

@@ -841,7 +841,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 				}
 			}
 
-			edbClassifyInfo.Sort = prevClassify.Sort + 1
+			edbClassifyInfo.Sort = prevSort + 1
 			edbClassifyInfo.ModifyTime = time.Now()
 			updateCol = append(updateCol, "Sort", "ModifyTime")
 		} else if prevClassify == nil && nextClassify == nil && prevEdbInfo == nil && nextEdbInfo == nil && parentClassifyId > 0 {
@@ -948,7 +948,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 				}
 			}
 
-			edbInfo.Sort = prevEdbInfo.Sort + 1
+			edbInfo.Sort = prevSort + 1
 			edbInfo.ModifyTime = time.Now()
 			updateCol = append(updateCol, "Sort", "ModifyTime")
 		} else if prevClassify == nil && nextClassify == nil && prevEdbInfo == nil && nextEdbInfo == nil && parentClassifyId > 0 {