change gorm

controllers/target.go

@@ -169,7 +169,7 @@ func (this *TargetController) DataAdd() {
 		br.ErrMsg = "获取信息失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.TradeCode != `` {
 		br.Msg = "该指标当前日期下，数据已录入"
 		return
 	}
@@ -261,13 +261,19 @@ func (this *TargetController) DataEdit() {
 	edbdata.ModifyTime = time.Now()
 
 	if req.OldCreateDate == "" {
-		item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取信息失败！"
-			br.ErrMsg = "获取信息失败，Err:" + err.Error()
-			return
+		var isFind bool
+		_, err = models.GetDataInfo(req.TradeCode, req.CreateDate)
+		if err != nil {
+			if !utils.IsErrNoRow(err) {
+				br.Msg = "获取信息失败！"
+				br.ErrMsg = "获取信息失败，Err:" + err.Error()
+				return
+			}
+			isFind = false
+		} else {
+			isFind = true
 		}
-		if item == nil { //新增
+		if !isFind { //新增
 			_, err = models.AddEdbdata(edbdata)
 			if err != nil {
 				br.Msg = "新增失败"
@@ -291,13 +297,19 @@ func (this *TargetController) DataEdit() {
 				return
 			}
 		} else {
-			item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-			if err != nil && !utils.IsErrNoRow(err) {
-				br.Msg = "获取信息失败！"
-				br.ErrMsg = "获取信息失败，Err:" + err.Error()
-				return
+			var isFind bool
+			_, err = models.GetDataInfo(req.TradeCode, req.CreateDate)
+			if err != nil {
+				if !utils.IsErrNoRow(err) {
+					br.Msg = "获取信息失败！"
+					br.ErrMsg = "获取信息失败，Err:" + err.Error()
+					return
+				}
+				isFind = false
+			} else {
+				isFind = true
 			}
-			if item == nil {
+			if !isFind {
 				_, err = models.AddEdbdata(edbdata)
 				if err != nil {
 					br.Msg = "新增失败"
@@ -318,7 +330,7 @@ func (this *TargetController) DataEdit() {
 				br.ErrMsg = "获取信息失败，Err:" + err.Error()
 				return
 			}
-			if oldItem != nil {
+			if oldItem != nil && oldItem.TradeCode != `` {
 				record := new(models.EdbdataDeleteRecord)
 				record.TradeCode = oldItem.TradeCode
 				record.Dt = oldItem.Dt
@@ -537,7 +549,7 @@ func (this *TargetController) TargetList() {
 			userName, ok := systemUserMap[v.UserId]
 			if ok == false {
 				systemUser, _ := system.GetSysAdminById(v.UserId)
-				if systemUser != nil {
+				if systemUser != nil && systemUser.AdminId > 0 {
 					userName = systemUser.RealName
 				} else {
 					userName = `无`
@@ -673,7 +685,7 @@ func (this *TargetController) TargetEdit() {
 		br.ErrMsg = "获取信息失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.TradeCode != "" {
 		if req.TradeCode != item.TradeCode && item.TradeCode != "" {
 			br.Msg = "指标名称已存在"
 			return
@@ -1078,7 +1090,7 @@ func (this *TargetController) ExportDataList() {
 	}
 
 	fileName := `手工数据`
-	if frequencies == nil {
+	if frequencies == nil || len(frequencies) <= 0 {
 		sheet, err := xlsxFile.AddSheet("无数据")
 		if err != nil {
 			br.Msg = "新增Sheet失败"
@@ -1150,7 +1162,8 @@ func (this *TargetController) ExportDataList() {
 				return
 			}
 			for _, item := range items {
-				if dataMap[item.TradeCode] == nil {
+				tmpItem, ok := dataMap[item.TradeCode]
+				if !ok || tmpItem == nil {
 					dataMap[item.TradeCode] = make(map[string]*models.EdbdataItem)
 				}
 				dataMap[item.TradeCode][item.Dt] = item
@@ -1327,7 +1340,7 @@ func (this *TargetController) DataCheck() {
 		br.Msg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.TradeCode != `` {
 		resp.Status = 1
 		resp.Close = item.Close
 	} else {
@@ -2871,7 +2884,7 @@ func (this *TargetController) ImportTarget() {
 						//return
 					}
 					//存在该指标，那么退出当前循环，进入下一循环
-					if item != nil {
+					if item != nil && item.TradeCode != `` {
 						failItem := &models.EdbImportFail{
 							ClassifyName: classifyName,
 							Frequency:    frequency,