change gorm

controllers/data_manage/my_chart.go

@@ -603,7 +603,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)
 		}
@@ -797,7 +797,7 @@ func (this *MyChartController) MyChartAdd() {
 	}
 	resp := new(data_manage.MyChartAddResp)
 	var myChartClassifyId string
-	if existItem != nil { //修改
+	if existItem != nil && existItem.MyChartId > 0 { //修改
 		fmt.Println("modify")
 		for _, v := range req.MyChartClassifyId {
 			myChartClassifyId += strconv.Itoa(v) + ","
@@ -830,7 +830,7 @@ func (this *MyChartController) MyChartAdd() {
 			var sort float64
 			// 查找最小排序值
 			firstMapItem, _ := data_manage.GetMyChartSort(sysUser.AdminId, v, 0)
-			if firstMapItem != nil {
+			if firstMapItem != nil && firstMapItem.MyChartClassifyMappingId > 0 {
 				sort = firstMapItem.Sort
 			}
 			//获取最大的排序字段
@@ -938,7 +938,7 @@ func (this *MyChartController) MyChartAddToClassify() {
 	}
 	resp := new(data_manage.MyChartAddResp)
 	var myChartClassifyId string
-	if existItem != nil { //修改
+	if existItem != nil && existItem.MyChartId > 0 { //修改
 		fmt.Println("modify")
 		for _, v := range req.MyChartClassifyId {
 			myChartClassifyId += strconv.Itoa(v) + ","
@@ -1051,7 +1051,7 @@ func (this *MyChartController) GetMyChartClassifyIdList() {
 	pars = append(pars, sysUser.AdminId, chartInfoId)
 
 	existItem, _ := data_manage.GetMyChartDetailByCondition(condition, pars)
-	if existItem != nil {
+	if existItem != nil && existItem.MyChartId > 0 {
 		myChartClassifyList, err := data_manage.GetMyChartClassifyList(existItem.MyChartId)
 		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败！"
@@ -1989,11 +1989,11 @@ func (this *MyChartController) PublicClassifyList() {
 	// 指标显示的语言
 	{
 		configDetail, _ := system.GetConfigDetailByCode(this.SysUser.AdminId, system.ChartLanguageVar)
-		if configDetail != nil {
+		if configDetail != nil && configDetail.ConfigId > 0 {
 			language = configDetail.ConfigValue
 		} else {
 			configDetail, _ = system.GetDefaultConfigDetailByCode(system.ChartLanguageVar)
-			if configDetail != nil {
+			if configDetail != nil && configDetail.ConfigId > 0 {
 				language = configDetail.ConfigValue
 			}
 		}