change gorm

controllers/data_manage/manual.go

@@ -229,7 +229,7 @@ func (this *ChartClassifyController) AddManualClassify() {
 		br.ErrMsg = "判断名称是否已存在失败，Err:" + err.Error()
 		return
 	}
-	if classifyItem != nil {
+	if classifyItem != nil && classifyItem.ClassifyId > 0 {
 		if classifyItem.IsShow == 1 {
 			br.Msg = "分类名称已存在，请重新输入"
 			br.IsSendEmail = false
@@ -243,7 +243,7 @@ func (this *ChartClassifyController) AddManualClassify() {
 				return
 			}
 			parentItem, _ := data_manage.GetManualClassifyById(req.ParentId)
-			if parentItem != nil && parentItem.IsShow == 0 {
+			if parentItem != nil && parentItem.ClassifyId > 0 && parentItem.IsShow == 0 {
 				err = data_manage.ModifyManualClassifyIsShow(1, parentItem.ClassifyId, req.ParentId)
 				if err != nil {
 					br.Msg = "保存失败"
@@ -321,11 +321,9 @@ func (this *ChartClassifyController) ManualClassifyEdit() {
 		return
 	}
 
-	if classifyItem != nil {
-		if item.ClassifyId != classifyItem.ClassifyId {
-			br.Msg = "名称已存在,请重新输入"
-			return
-		}
+	if classifyItem != nil && classifyItem.ClassifyId > 0 && item.ClassifyId != classifyItem.ClassifyId {
+		br.Msg = "名称已存在,请重新输入"
+		return
 	}
 
 	err = data_manage.ModifyManualClassifyName(req.ClassifyName, req.ClassifyId, req.ParentId)

services/data/data_manage_permission/data_move.go

@@ -1450,17 +1450,22 @@ func MoveCustomAnalysisExcel2DefaultClassify(excelIds []int, adminId int, realNa
 	cond := ` AND excel_classify_name = ? AND sys_user_id = ?`
 	pars := make([]interface{}, 0)
 	pars = append(pars, "未分类", adminId)
+
+	// 是否找到
+	var isFind bool
 	classify, e := excel.GetExcelClassifyByCondition(cond, pars)
-	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取默认分类失败, %v", e)
-		return
-	}
-	if classify != nil {
+	if e != nil {
+		if !utils.IsErrNoRow(e) {
+			err = fmt.Errorf("获取默认分类失败, %v", e)
+			return
+		}
+	} else {
+		isFind = true
 		moveClassifyId = classify.ExcelClassifyId
 	}
 
 	// 新增一个新的分类
-	if classify == nil {
+	if !isFind {
 		classifyNew := &excel.ExcelClassify{
 			ExcelClassifyName: "未分类",
 			Source:            utils.CUSTOM_ANALYSIS_TABLE,