fix

controllers/data_manage/chart_classify.go

@@ -906,7 +906,7 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/chart_info.go

@@ -827,7 +827,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
 		}

controllers/data_manage/correlation/correlation_chart_classify.go

@@ -713,7 +713,7 @@ func (this *CorrelationChartClassifyController) ChartClassifyMove() {
 	//	}
 	//
 	//	//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-	//	if firstClassify != nil && firstClassify.Sort == 0 {
+	//	if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 	//		updateSortStr := ` sort + 1 `
 	//		_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 	//	}

controllers/data_manage/correlation/correlation_chart_info.go

@@ -400,7 +400,7 @@ func (this *CorrelationChartInfoController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
 		}

controllers/data_manage/cross_variety/chart_info.go

@@ -969,7 +969,7 @@ func (c *ChartInfoController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
 		}

controllers/data_manage/cross_variety/classify.go

@@ -197,7 +197,7 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -300,7 +300,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -324,7 +324,6 @@ func (c *ClassifyController) DeleteChartClassify() {
 			return
 		}
 
-
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
@@ -568,7 +567,7 @@ func (c *ClassifyController) ChartClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/edb_classify.go

@@ -662,7 +662,7 @@ func (this *EdbClassifyController) EdbClassifyMove() {
 	//	}
 	//
 	//	//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-	//	if firstClassify != nil && firstClassify.Sort == 0 {
+	//	if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 	//		updateSortStr := ` sort + 1 `
 	//		_ = data_manage.UpdateEdbClassifySortByParentId(firstClassify.ParentId, firstClassify.ClassifyId-1, 0, updateSortStr)
 	//	}

controllers/data_manage/edb_collect_classify.go

@@ -491,7 +491,7 @@ func (this *EdbCollectClassifyController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.EdbCollectClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateEdbCollectClassifySortByClassifyId(sysUser.AdminId, firstClassify.EdbCollectClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/edb_info.go

@@ -1473,7 +1473,7 @@ func (this *EdbInfoController) EdbInfoMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateEdbInfoSortByClassifyId(firstClassify.ClassifyId, 0, firstClassify.EdbInfoId-1, updateSortStr)
 		}

controllers/data_manage/excel/excel_info.go

@@ -1225,7 +1225,7 @@ func (c *ExcelInfoController) Move() {
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = excel3.UpdateExcelInfoSortByClassifyId(firstClassify.ExcelClassifyId, 0, firstClassify.ExcelInfoId+1, updateSortStr)
 			}

controllers/data_manage/future_good/future_good_chart_classify.go

@@ -305,7 +305,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -408,7 +408,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -432,7 +432,6 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
@@ -679,7 +678,7 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/future_good/future_good_chart_info.go

@@ -1144,7 +1144,7 @@ func (this *FutureGoodChartInfoController) ChartInfoMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, updateSortStr)
 		}

controllers/data_manage/line_equation/line_chart_classify.go

@@ -310,7 +310,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -413,7 +413,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -437,7 +437,6 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
@@ -685,7 +684,7 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/line_equation/line_chart_info.go

@@ -478,7 +478,7 @@ func (this *LineEquationChartInfoController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{chartInfo.Source}, updateSortStr)
 		}

controllers/data_manage/line_feature/chart_info.go

@@ -1527,7 +1527,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartInfoSortByClassifyId(firstClassify.ChartClassifyId, 0, firstClassify.ChartInfoId-1, []int{utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY}, updateSortStr)
 		}

controllers/data_manage/line_feature/classify.go

@@ -310,7 +310,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassifyCheck() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -413,7 +413,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 		pars := make([]interface{}, 0)
 		if len(childIds) > 0 {
 			ids := utils.IntArr2joinString(childIds, ",")
-			condition = ` AND chart_classify_id IN (`+ ids +`) `
+			condition = ` AND chart_classify_id IN (` + ids + `) `
 		} else {
 			condition = ` AND chart_classify_id = ? `
 			pars = append(pars, req.ChartClassifyId)
@@ -437,7 +437,6 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 			return
 		}
 
-
 		delIds := append(childIds, req.ChartClassifyId)
 
 		err = data_manage.DeleteChartClassifyByIds(delIds)
@@ -685,7 +684,7 @@ func (this *LineFeaturesChartClassifyController) ChartClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/my_chart.go

@@ -569,7 +569,7 @@ func (this *MyChartController) ClassifyMove() {
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.MyChartClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateMyChartClassifySortByClassifyId(sysUser.AdminId, firstClassify.MyChartClassifyId-1, 0, updateSortStr)
 		}

controllers/data_manage/predict_edb_classify.go

@@ -498,7 +498,7 @@ func (this *PredictEdbClassifyController) Move() {
 	//	}
 	//
 	//	//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-	//	if firstClassify != nil && firstClassify.Sort == 0 {
+	//	if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 	//		updateSortStr := ` sort + 1 `
 	//		_ = data_manage.UpdateEdbClassifySortByParentId(firstClassify.ParentId, firstClassify.ClassifyId-1, 0, updateSortStr)
 	//	}

controllers/data_manage/range_analysis/chart_classify.go

@@ -737,7 +737,7 @@ func (this *RangeChartClassifyController) ChartClassifyMove() {
 	//	}
 	//
 	//	//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-	//	if firstClassify != nil && firstClassify.Sort == 0 {
+	//	if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 	//		updateSortStr := ` sort + 1 `
 	//		_ = data_manage.UpdateChartClassifySortByParentId(firstClassify.ParentId, firstClassify.ChartClassifyId-1, 0, updateSortStr)
 	//	}

controllers/sandbox/sandbox.go

@@ -1428,7 +1428,7 @@ func (this *SandboxController) ChartClassifyMove() {
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.SandboxClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = sandbox.UpdateSandboxSortByClassifyId(firstClassify.SandboxClassifyId, 0, firstClassify.SandboxId-1, updateSortStr)
 			}
@@ -1617,7 +1617,7 @@ func (this *SandboxController) ChartClassifyMove() {
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.SandboxClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = sandbox.UpdateSandboxClassifySortByParentId(firstClassify.ParentId, firstClassify.SandboxClassifyId-1, 0, updateSortStr)
 			}
@@ -1722,7 +1722,7 @@ func (this *SandboxController) ListV2() {
 		childIds := make([]int, 0)
 		sandboxService.GetSandBoxClassifyChildIds(sandboxClassifyId, classsifyMap, &childIds)
 		if len(childIds) > 0 {
-			ids := utils.IntArr2joinString(childIds,",")
+			ids := utils.IntArr2joinString(childIds, ",")
 			condition += " AND sandbox_classify_id IN(" + ids + ") "
 		} else {
 			condition += " AND sandbox_classify_id = ? "
@@ -1750,11 +1750,10 @@ func (this *SandboxController) ListV2() {
 		return
 	}
 
-
 	for i, v := range list {
 		parentIds := make([]int, 0)
 		sandboxService.GetSandBoxParentIds(v.SandboxClassifyId, classsifyMap, &parentIds)
-		ids := utils.IntArr2joinString(parentIds,",")
+		ids := utils.IntArr2joinString(parentIds, ",")
 		list[i].ParentIds = ids
 	}
 
@@ -2162,7 +2161,7 @@ func (this *SandboxController) GetSandboxDetail() {
 //		}
 //
 //		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-//		if firstClassify != nil && firstClassify.Sort == 0 {
+//		if firstClassify != nil && firstClassify.SandboxClassifyId > 0 && firstClassify.Sort == 0 {
 //			updateSortStr := ` sort + 1 `
 //			_ = sandbox.UpdateSandboxSortByClassifyId(firstClassify.SandboxClassifyId, 0, firstClassify.SandboxId-1, updateSortStr)
 //		}
@@ -2303,7 +2302,7 @@ func (this *SandboxController) GetSandboxDetail() {
 //		}
 //
 //		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-//		if firstClassify != nil && firstClassify.Sort == 0 {
+//		if firstClassify != nil && firstClassify.SandboxClassifyId > 0 && firstClassify.Sort == 0 {
 //			updateSortStr := ` sort + 1 `
 //			_ = sandbox.UpdateSandboxClassifySortByParentId(firstClassify.ParentId, firstClassify.SandboxClassifyId-1, 0, updateSortStr)
 //		}

services/chart_permission.go

@@ -405,7 +405,7 @@ func moveChartPermission(permissionInfo, prevPermission, nextPermission *models.
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstPermission != nil && firstPermission.ChartPermissionId != 0 && firstPermission.Sort == 0 {
+		if firstPermission != nil && firstPermission.ChartPermissionId > 0 && firstPermission.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = models.UpdateChartPermissionSortByParentId(parentId, firstPermission.ChartPermissionId-1, 0, updateSortStr, productId)
 		}

services/classify.go

@@ -159,7 +159,7 @@ func moveReportClassify(classifyInfo, prevClassify, nextClassify *models.Classif
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstPermission != nil && firstPermission.Id != 0 && firstPermission.Sort == 0 {
+		if firstPermission != nil && firstPermission.Id > 0 && firstPermission.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = models.UpdateClassifySortByParentId(parentId, firstPermission.Id-1, 0, updateSortStr)
 		}

services/data/chart_classify.go

@@ -634,7 +634,7 @@ func moveChartClassify(parentChartClassifyInfo, chartClassifyInfo, prevClassify,
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = data_manage.UpdateChartClassifySortByParentIdAndSource(parentClassifyId, firstClassify.ChartClassifyId-1, 0, updateSortStr, source)
 				//该分类下的所有图表也需要+1
@@ -649,7 +649,7 @@ func moveChartClassify(parentChartClassifyInfo, chartClassifyInfo, prevClassify,
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstEdb != nil && firstEdb.Sort == 0 {
+				if firstEdb != nil && firstEdb.ChartClassifyId > 0 && firstEdb.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = data_manage.UpdateChartInfoSortByClassifyIdV2(parentClassifyId, 0, firstEdb.ChartInfoId-1, updateSortStr)
 					_ = data_manage.UpdateChartClassifySortByParentIdAndSource(parentClassifyId, 0, 0, updateSortStr, source)
@@ -765,7 +765,7 @@ func moveChartClassify(parentChartClassifyInfo, chartClassifyInfo, prevClassify,
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ChartClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = data_manage.UpdateChartClassifySortByParentIdAndSource(parentClassifyId, firstClassify.ChartClassifyId-1, 0, updateSortStr, source)
 				//该分类下的所有图表也需要+1
@@ -780,7 +780,7 @@ func moveChartClassify(parentChartClassifyInfo, chartClassifyInfo, prevClassify,
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstEdb != nil && firstEdb.Sort == 0 {
+				if firstEdb != nil && firstEdb.ChartClassifyId > 0 && firstEdb.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = data_manage.UpdateChartInfoSortByClassifyIdV2(parentClassifyId, 0, firstEdb.ChartInfoId-1, updateSortStr)
 					_ = data_manage.UpdateChartClassifySortByParentIdAndSource(parentClassifyId, 0, 0, updateSortStr, source)

services/data/edb_classify.go

@@ -1233,7 +1233,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, classifyType)
 				//该分类下的所有指标也需要+1
@@ -1248,7 +1248,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstEdb != nil && firstEdb.Sort == 0 {
+				if firstEdb != nil && firstEdb.ClassifyId > 0 && firstEdb.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, firstEdb.EdbInfoId-1, updateSortStr)
 					_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, classifyType)
@@ -1364,7 +1364,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, firstClassify.ClassifyId-1, 0, updateSortStr, classifyType)
 				//该分类下的所有指标也需要+1
@@ -1379,7 +1379,7 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstEdb != nil && firstEdb.Sort == 0 {
+				if firstEdb != nil && firstEdb.ClassifyId > 0 && firstEdb.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = data_manage.UpdateEdbInfoSortByClassifyId(parentClassifyId, 0, firstEdb.EdbInfoId-1, updateSortStr)
 					_ = data_manage.UpdateEdbClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, classifyType)

services/data/excel/excel_classify.go

@@ -239,7 +239,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ExcelClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, firstClassify.ExcelClassifyId-1, 0, updateSortStr, source)
 				//该分类下的所有表格也需要+1
@@ -254,7 +254,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstExcel != nil && firstExcel.Sort == 0 {
+				if firstExcel != nil && firstExcel.ExcelClassifyId > 0 && firstExcel.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = excel.UpdateExcelInfoSortByClassifyId(parentClassifyId, 0, firstExcel.ExcelInfoId-1, updateSortStr, source)
 					_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, source)
@@ -370,7 +370,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 			}
 
 			//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-			if firstClassify != nil && firstClassify.Sort == 0 {
+			if firstClassify != nil && firstClassify.ExcelClassifyId > 0 && firstClassify.Sort == 0 {
 				updateSortStr := ` sort + 1 `
 				_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, firstClassify.ExcelClassifyId-1, 0, updateSortStr, source)
 				//该分类下的所有表格也需要+1
@@ -385,7 +385,7 @@ func moveExcelClassify(parentExcelClassifyInfo, excelClassifyInfo, prevClassify,
 				}
 
 				//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-				if firstExcel != nil && firstExcel.Sort == 0 {
+				if firstExcel != nil && firstExcel.ExcelClassifyId > 0 && firstExcel.Sort == 0 {
 					updateSortStr := ` sort + 1 `
 					_ = excel.UpdateExcelInfoSortByClassifyId(parentClassifyId, 0, firstExcel.ExcelInfoId-1, updateSortStr, source)
 					_ = excel.UpdateExcelClassifySortByParentId(parentClassifyId, 0, 0, updateSortStr, source)

services/data/predict_edb_info.go

@@ -138,7 +138,7 @@ func MovePredictEdbInfo(edbInfoId, classifyId, prevEdbInfoId, nextEdbInfoId int,
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.ClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateEdbInfoSortByClassifyId(firstClassify.ClassifyId, 0, firstClassify.EdbInfoId-1, updateSortStr)
 		}

services/knowledge/classify.go

@@ -160,7 +160,7 @@ func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.K
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstPermission != nil && firstPermission.ClassifyId != 0 && firstPermission.Sort == 0 {
+		if firstPermission != nil && firstPermission.ClassifyId > 0 && firstPermission.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = knowledgeObj.UpdateClassifySortByParentId(parentId, firstPermission.ClassifyId-1, 0, updateSortStr, resourceType)
 		}

services/report_chapter.go

@@ -147,7 +147,7 @@ func moveReportChapter(reportChapter, prevReportChapter, nextReportChapter *mode
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstReportChapter != nil && firstReportChapter.ReportChapterId != 0 && firstReportChapter.Sort == 0 {
+		if firstReportChapter != nil && firstReportChapter.ReportChapterId > 0 && firstReportChapter.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = ob.UpdateReportChapterSortByReportId(reportId, firstReportChapter.ReportChapterId-1, 0, updateSortStr)
 		}

services/report_chapter_type.go

@@ -130,7 +130,7 @@ func moveReportChapterType(reportChapterType, prevReportChapterType, nextReportC
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstReportChapterType != nil && firstReportChapterType.ReportChapterTypeId != 0 && firstReportChapterType.Sort == 0 {
+		if firstReportChapterType != nil && firstReportChapterType.ReportChapterTypeId > 0 && firstReportChapterType.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = models.UpdateReportChapterTypeSortByResearchType(researchType, firstReportChapterType.ReportChapterTypeId-1, 0, updateSortStr)
 		}